summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge pull request #7068 from chino/only-check-ci-status-when-ci-service-enabledDmitriy Zaporozhets2014-06-031-1/+1
| |\ \ | | | | | | | | project: ci_service should only catch ci services
| | * | project: ci_service should only catch ci servicesDaniel Aquino2014-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Small spelling correction in the readme.Sytse Sijbrandij2014-06-031-1/+1
|/ / /
* | | Merge branch 'chrome-app' into 'master'Sytse Sijbrandij2014-06-031-1/+1
|\ \ \ | | | | | | | | | | | | Chrome app
| * | | Add chrome app of Go Sueyoshi.Sytse Sijbrandij2014-06-031-1/+1
|/ / /
* | | Merge branch 'same-origin-header' into 'master'Dmitriy Zaporozhets2014-06-032-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | Same origin header Fixes #1313
| * | | Ensure sidekiq is displayed by setting X-Frame-Options.GitLab2014-06-032-0/+2
| | | |
| * | | Revert "Set x-frame-option to sameorigin to allow the Sidekiq iframe to ↵GitLab2014-06-032-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display." This reverts commit 754b0838e0c2857b0ca73d2ced675ed5b3042242. 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.
| * | | Set x-frame-option to sameorigin to allow the Sidekiq iframe to display.GitLab2014-06-032-1/+2
| | | |
* | | | Merge branch 'case-insensetive-search' into 'master'Dmitriy Zaporozhets2014-06-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case insensetive search Fixes #1258 cc @marc
| * | | | Case-insensetive search for issue/mr titleDmitriy Zaporozhets2014-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-06-031-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Ui improvements
| * | | | | Improve green themeDmitriy Zaporozhets2014-06-031-7/+7
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Show events from all projects on user pageDmitriy Zaporozhets2014-06-031-1/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'remove_artifact' into 'master'Dmitriy Zaporozhets2014-06-032-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove artifact This commit 07a9d44de7a54b2cd1bffd9fcc830f7b2a03b549 caused letter a to be shown 72 times when the commit is being edited, removed that.
| * | | | Add ch width.Marin Jankovski2014-06-032-1/+1
| | | | |
| * | | | Do not show a 72 times.Marin Jankovski2014-06-031-1/+0
| | | | |
* | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-06-034-61/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Ui improvements
| * | | | | Improve UI/UX for create/edit group in admin areaDmitriy Zaporozhets2014-06-034-61/+64
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Use same colors for disabled buttonsDmitriy Zaporozhets2014-06-031-8/+0
| |/ / / |/| | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-06-037-30/+42
|\ \ \ \ | | | | | | | | | | | | | | | Ui improvements
| * | | | Remove color-named css classesDmitriy Zaporozhets2014-06-037-30/+42
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | New base colorsDmitriy Zaporozhets2014-06-031-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-06-0325-171/+245
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Ui improvements
| * | | | Improve admin/projects pageDmitriy Zaporozhets2014-06-033-29/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Change page-title font/colorDmitriy Zaporozhets2014-06-032-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Replace files icons with fontawesomeDmitriy Zaporozhets2014-06-0312-5/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve admin/user formDmitriy Zaporozhets2014-06-034-13/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Restyle admin/user pageDmitriy Zaporozhets2014-06-034-121/+175
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'revert-img-paste' into 'master'Dmitriy Zaporozhets2014-06-039-126/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Revert img paste Fixes #1307
| * | | | Revert "Implements and refactors clipboard feature for markdown."Dmitriy Zaporozhets2014-06-039-126/+25
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2273234653924b731f9ef01432e392481ee1d4e2. 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
* | | | Merge pull request #7062 from williamherry/fix_add_smtp_settings_to_gitignoreMarin Jankovski2014-06-031-0/+1
|\ \ \ \ | |/ / / |/| | | add smtp_settings.rb to gitignore file
| * | | add smtp_settings.rb to gitignore fileWilliam Herry2014-06-031-0/+1
| | | |
* | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-06-036-16/+15
|\ \ \ \ | | |/ / | |/| | | | | | Ui improvements
| * | | Use big colorful pills for switch between MR tabsDmitriy Zaporozhets2014-06-032-10/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve small panelsDmitriy Zaporozhets2014-06-031-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use padding like most of other bootstrap elementsDmitriy Zaporozhets2014-06-034-6/+5
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #6943 from jvanbaarsen/spec-fixDmitriy Zaporozhets2014-06-034-31/+30
|\ \ \ | | | | | | | | Fix for failing specs
| * | | Put back the travis informationJeroen van Baarsen2014-05-301-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | | Fix for failing specsJeroen van Baarsen2014-05-305-34/+30
| | | |
* | | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2014-06-025-11/+33
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | Performance improvements Fixes #1135
| * | | Get group members only if group not nilDmitriy Zaporozhets2014-06-021-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add members paginations to admin/project pageDmitriy Zaporozhets2014-06-022-2/+8
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve admin group page performanceDmitriy Zaporozhets2014-06-023-9/+22
|/ / / | | | | | | | | | | | | | | | Add pagination for projects and members to /admin/groups/:group page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'developers-protected-branches' into 'master'Dmitriy Zaporozhets2014-06-022-8/+19
|\ \ \ | |_|/ |/| | | | | Dont show new file link on protected branch for developers
| * | Dont show new file link on protected branch for developersDmitriy Zaporozhets2014-06-022-8/+19
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'profile-personal-projects' into 'master'Dmitriy Zaporozhets2014-06-026-21/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show only personal projects on user page When I visit user profile page I see all projects he have access too (if i can also access same projects). That means I see a list of hundreds projects if he joined several groups. ![Screenshot 2014-05-30 18.24.43](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/5209c0cb01/Screenshot_2014-05-30_18.24.43.png) It inefficient because: * Slow page load if a lot of projects * Hard to find his personal projects I propose to replace it with `Personal projects` list. It has next advantages: * we don't load huge useless list of projects * I can see if user have personal projects I have access to * faster page load. We don't load all projects from all groups where user invited ![Screenshot 2014-05-30 18.20.29](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/8a5d02a00d/Screenshot_2014-05-30_18.20.29.png) Partly fixes #1135
| * | Fix tests for user pageDmitriy Zaporozhets2014-06-024-18/+22
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Show only personal projects on profile pageDmitriy Zaporozhets2014-05-303-3/+6
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'ui-colors' into 'master'Dmitriy Zaporozhets2014-06-028-12/+16
|\ \ | | | | | | | | | Refactoring ui colors
View Lorry Controller Status