Commits · 0c869ed75cb9d4255cf4e6c268ab5e884169aeb8 · Kazuhiko Shiozaki / gitlab-ce

03 Jun, 2014 38 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 0c869ed7
  Dmitriy Zaporozhets authored Jun 03, 2014
  
  0c869ed7
- Merge pull request #7068 from chino/only-check-ci-status-when-ci-service-enabled · 239b84e9
  Dmitriy Zaporozhets authored Jun 03, 2014
```
project: ci_service should only catch ci services
```
  239b84e9
- Small spelling correction in the readme. · df92f825
  Sytse Sijbrandij authored Jun 03, 2014
  
  df92f825
- Merge branch 'chrome-app' into 'master' · ab7a9347
  Sytse Sijbrandij authored Jun 03, 2014
```
Chrome app
```
  ab7a9347
- Add chrome app of Go Sueyoshi. · 7a385b81
  Sytse Sijbrandij authored Jun 03, 2014
  
  7a385b81
- project: ci_service should only catch ci services · be85d1d2
  Daniel Aquino authored Jun 03, 2014
```
ci_service should return true if a ci service is enabled.  Currently
it's checking for any service being enabled instead of only services in
the ci category.
```
  be85d1d2
- Merge branch 'same-origin-header' into 'master' · 605dfc9c
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Same origin header

Fixes #1313
```
  605dfc9c
- Merge branch 'case-insensetive-search' into 'master' · d042257a
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Case insensetive search

Fixes #1258

cc @marc
```
  d042257a
- Merge branch 'ui-improvements' into 'master' · 4e37212a
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Ui improvements
```
  4e37212a
- Show events from all projects on user page · 7984e5b1
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7984e5b1
- Ensure sidekiq is displayed by setting X-Frame-Options. · fdcc5dde
  GitLab authored Jun 03, 2014
  
  fdcc5dde
- Case-insensetive search for issue/mr title · f39db7e5
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f39db7e5
- Improve green theme · f8705076
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f8705076
- Merge branch 'remove_artifact' into 'master' · b6f3f626
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Remove artifact

This commit 07a9d44d caused letter a to be shown 72 times when the commit is being edited, removed that.
```
  b6f3f626
- Merge branch 'ui-improvements' into 'master' · a5208596
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Ui improvements
```
  a5208596
- Revert "Set x-frame-option to sameorigin to allow the Sidekiq iframe to display." · f758438e
  GitLab authored Jun 03, 2014
```
This reverts commit 754b0838.

Sidekiq rendered via mounted sinatra app. We don't need to change
controller headers. It won't affect sidekiq at all. Please modify nginx
config instead for all gitlab app.
```
  f758438e
- Improve UI/UX for create/edit group in admin area · ad432583
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ad432583
- Use same colors for disabled buttons · 5b87a4dc
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5b87a4dc
- Set x-frame-option to sameorigin to allow the Sidekiq iframe to display. · 754b0838
  GitLab authored Jun 03, 2014
  
  754b0838
- Merge branch 'ui-improvements' into 'master' · d7960bca
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Ui improvements
```
  d7960bca
- New base colors · fe302d4c
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fe302d4c
- Remove color-named css classes · 55ab7a2a
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  55ab7a2a
- Merge branch 'ui-improvements' into 'master' · 729618c5
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Ui improvements
```
  729618c5
- Improve admin/projects page · 95d61a09
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  95d61a09
- Change page-title font/color · 4e55dd5f
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4e55dd5f
- Replace files icons with fontawesome · 4656ef95
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4656ef95
- Add ch width. · da37a251
  Marin Jankovski authored Jun 03, 2014
  
  da37a251
- Improve admin/user form · 31c963ed
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  31c963ed
- Merge branch 'revert-img-paste' into 'master' · 67b0857d
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Revert img paste

Fixes #1307
```
  67b0857d
- Restyle admin/user page · fc43c4e7
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fc43c4e7
- Merge pull request #7062 from williamherry/fix_add_smtp_settings_to_gitignore · a727d25e
  Marin Jankovski authored Jun 03, 2014
```
add smtp_settings.rb to gitignore file
```
  a727d25e
- Do not show a 72 times. · d2851b08
  Marin Jankovski authored Jun 03, 2014
  
  d2851b08
- Revert "Implements and refactors clipboard feature for markdown." · 3398e0a3
  Dmitriy Zaporozhets authored Jun 03, 2014
```
This reverts commit 22732346.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/issues/_form.html.haml
	app/views/projects/merge_requests/_form.html.haml
	app/views/projects/merge_requests/_new_submit.html.haml
	app/views/projects/milestones/_form.html.haml
	app/views/projects/notes/_form.html.haml
	app/views/projects/wikis/_form.html.haml
```
  3398e0a3
- Merge branch 'ui-improvements' into 'master' · 31fcac9f
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Ui improvements
```
  31fcac9f
- Use big colorful pills for switch between MR tabs · 87e0fe6f
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  87e0fe6f
- Improve small panels · 7bb0551f
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7bb0551f
- Use padding like most of other bootstrap elements · 636718ad
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  636718ad
- Merge pull request #6943 from jvanbaarsen/spec-fix · a54bef0a
  Dmitriy Zaporozhets authored Jun 03, 2014
```
Fix for failing specs
```
  a54bef0a
02 Jun, 2014 2 commits
- Merge branch 'performance-improvements' into 'master' · fc72f8e3
  Dmitriy Zaporozhets authored Jun 02, 2014
```
Performance improvements

Fixes #1135
```
  fc72f8e3
- Get group members only if group not nil · 5a064b02
  Dmitriy Zaporozhets authored Jun 02, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5a064b02