Commits · 907bbb2b05860be401c77b305721b35a2850ea71 · Kazuhiko Shiozaki / gitlab-ce

29 May, 2015 17 commits
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 907bbb2b
  Dmitriy Zaporozhets authored May 29, 2015
  
  907bbb2b
- Style header search field on focus · d4a58c68
  Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d4a58c68
- Merge branch 'mr-wip-text' into 'master' · 4a1df710
  Dmitriy Zaporozhets authored May 29, 2015
```
Shorten merge request WIP text.

![Screen_Shot_2015-05-29_at_11.37.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5853d9057103bdaacded17798378f68e/Screen_Shot_2015-05-29_at_11.37.46.png)
![Screen_Shot_2015-05-29_at_11.37.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/be96ee32ab5a8f23835dc37306259b17/Screen_Shot_2015-05-29_at_11.37.49.png)

See merge request !741
```
  4a1df710
- Merge branch 'feature/saml_support' into 'master' · 70b29c35
  Douwe Maan authored May 29, 2015
```
Add SAML support via Omniauth

Split of !669, with doc

See merge request !722
```
  70b29c35
- Merge branch 'rs-merge-request-tabs-the-third' into 'master' · aa97325d
  Dmitriy Zaporozhets authored May 29, 2015
```
Include location.search and location.hash in URL for replaceState

Forgot these 😊

See merge request !740
```
  aa97325d
- Shorten merge request WIP text. · d5b1c58e
  Douwe Maan authored May 29, 2015
  
  d5b1c58e
- Include location.search and location.hash in URL for replaceState · 7f529ef0
  Robert Speicher authored May 29, 2015
  
  7f529ef0
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 2f3a11fe
  Dmitriy Zaporozhets authored May 29, 2015
  
  2f3a11fe
- Merge branch 'rs-teaspoon' into 'master' · acb7721f
  Dmitriy Zaporozhets authored May 29, 2015
```
Add Teaspoon for Javascript testing

Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.

See https://github.com/modeset/teaspoon

See merge request !715
```
  acb7721f
- Fix diff header with submodule change · e11e042d
  Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e11e042d
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · ac584d6b
  Dmitriy Zaporozhets authored May 29, 2015
  
  ac584d6b
- Merge branch 'rs-persist-tab-selection-more-betterer' into 'master' · c090ebc0
  Dmitriy Zaporozhets authored May 29, 2015
```
Improve MergeRequest tab-persisting behavior

Now uses the path instead of the hash.

See discussion in !728

See merge request !737
```
  c090ebc0
- Merge pull request #9318 from jvanbaarsen/allow-special-chars-bio · d047d299
  Dmitriy Zaporozhets authored May 29, 2015
```
Allow special characters in users bio
```
  d047d299
- Improve MergeRequest tab-persisting behavior · 3f156ed4
  Robert Speicher authored May 29, 2015
```
Now uses the path instead of the hash.

See discussion in #728.
```
  3f156ed4
- Add MergeRequests#commits action and route · f46b3670
  Robert Speicher authored May 29, 2015
```
/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
```
  f46b3670
- Bump turbolinks version · cef8ab46
  Robert Speicher authored May 29, 2015
  
  cef8ab46
- Merge branch 'master' into 'master' · f95eeee1
  Robert Speicher authored May 29, 2015
```
Remove extra brace

Extraneous curly brace creeped in prior commit.

See merge request !734
```
  f95eeee1
28 May, 2015 23 commits
- Disable Rack::MiniProfiler for /teaspoon path · bd12ca5e
  Robert Speicher authored May 23, 2015
  
  bd12ca5e
- Update jasmine:ci task to use teaspoon · 330c2538
  Robert Speicher authored May 06, 2015
  
  330c2538
- Stub ajax in JS specs · d2256c18
  Robert Speicher authored May 06, 2015
  
  d2256c18
- Remove jasmine-fixture, use teaspoon fixtures · c9788bd9
  Robert Speicher authored May 06, 2015
  
  c9788bd9
- Javascripts don't need to require jquery or bootstrap explicitly · 73440b03
  Robert Speicher authored May 06, 2015
  
  73440b03
- teaspoon install · d850a57f
  Robert Speicher authored May 06, 2015
  
  d850a57f
- Remove jasmine-rails; add teaspoon · 05aa71cc
  Robert Speicher authored May 06, 2015
  
  05aa71cc
- Remove extra brace · b8977cb4
  Mike Butsko authored May 28, 2015
  
  b8977cb4
- Merge branch 'nicer-acccount-page' into 'master' · 51888f74
  Dmitriy Zaporozhets authored May 28, 2015
```
Make user settings account page nicer

* make 2 factor auth section `panel-default`
* make oauth buttons smaller
* remove primary button from reset token form

![Screenshot_2015-05-28_20.37.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e536723e087b72a5c08b29072fb4972f/Screenshot_2015-05-28_20.37.30.png)

See merge request !733
```
  51888f74
- Make user settings account page nicer · 08a12f24
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  08a12f24
- Merge branch 'project-aside' into 'master' · d0d596ae
  Dmitriy Zaporozhets authored May 28, 2015
```
Use panels instead of well for widgets in project sidebar

Cleaner look and less distractive

![Screenshot_2015-05-28_17.31.27](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4f8e58f76c7f62c488dd571c313e21e/Screenshot_2015-05-28_17.31.27.png)

See merge request !732
```
  d0d596ae
- Use panels instead of well for widgets in project sidebar · a01737ac
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a01737ac
- Merge branch 'profile-settings' · ce5928f4
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/profiles/accounts/show.html.haml
```
  ce5928f4
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · ad346233
  Dmitriy Zaporozhets authored May 28, 2015
  
  ad346233
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 0c7da9d5
  Dmitriy Zaporozhets authored May 28, 2015
  
  0c7da9d5
- Fix profile tests after header rename · 9e50f28e
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9e50f28e
- Prefer panels over fieldset when different forms · 35d0d774
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  35d0d774
- Merge branch 'user-destroy-wo-groups' into 'master' · 05a44dcb
  Dmitriy Zaporozhets authored May 28, 2015
```
You can not remove user if he/she is an only owner of group

To prevent loose of group data you need to transfer or remove group
first before you can remove user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !730
```
  05a44dcb
- Consistent header look for setting pages · 47989d60
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  47989d60
- Re-organize profile settings titles and headers · dcc9dc94
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dcc9dc94
- Fix current user removal · 2db02679
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2db02679
- Add CHANGELOG item · 9cc23910
  Dmitriy Zaporozhets authored May 28, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9cc23910
- You can not remove user if he/she is an only owner of group · 49915451
  Dmitriy Zaporozhets authored May 28, 2015
```
To prevent loose of group data you need to transfer or remove group
first before you can remove user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  49915451