summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Fix typo in CHANGELOG and add creditStan Hu2015-03-161-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix typo for HipChat doc: messaging, not messageStan Hu2015-03-161-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'add-hipchat-doc' into 'master'Hannes Rosenögger2015-03-163-1/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for HipChat integration This was a source of confusion here: https://github.com/gitlabhq/gitlabhq/issues/7373 See merge request !393
| * | | | | | | | | | | | | | Add HipChat integration documentation as this was a source of confusionStan Hu2015-03-163-1/+56
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'auto-config-git' into 'master'Hannes Rosenögger2015-03-163-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto config git if user forgot If git is not configured properly, let gitlab:check try to fix it by executing the commands itself instead of outputing how the user could fix it. If this fails the error is still displayed. Edit; Not yet added to the CHANGELOG as; * Im not really sure this fits in the scope of a test * No clue how to test this properly See merge request !383
| * | | | | | | | | | | | | | Let the server fix unconfigured gitZeger-Jan van de Weg2015-03-163-10/+32
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Small improvements to group/project member rowsDmitriy Zaporozhets2015-03-153-2/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'team-members' into 'master'Dmitriy Zaporozhets2015-03-1673-407/+462
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use same layout and interactivity for project members as group members and make code more consistent. It's probably easiest to review the commits one by one, but keep in mind that later commits sometimes touch the same place as earlier ones, so look at the complete diff to add comments. The project members page and group members page now look and work the same, with an inline "Add members" form, member search and editing of access levels and deleting without page refresh. Before: ![Screen_Shot_2015-03-13_at_16.50.39](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2cd023c48de0a643ce04df965f39e1f5/Screen_Shot_2015-03-13_at_16.50.39.png) After: ![Screen_Shot_2015-03-13_at_16.50.02](https://dev.gitlab.org/gitlab/gitlabhq/uploads/fdef480daf2859ed74f5641af1f337b3/Screen_Shot_2015-03-13_at_16.50.02.png) See merge request !1695
| * | | | | | | | | | | | | Add changelog item.Douwe Maan2015-03-151-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update button class.Douwe Maan2015-03-151-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix failing specs.Douwe Maan2015-03-151-1/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use same layout and interactivity for project members as group members.Douwe Maan2015-03-1519-106/+137
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move group leave action from dashboard/groups to groups/group_members.Douwe Maan2015-03-155-25/+18
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-1514-37/+60
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move project members index from `/team` to `/project_members`Douwe Maan2015-03-157-10/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove old team scopes.Douwe Maan2015-03-153-3/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use `member` instead of `tm`.Douwe Maan2015-03-152-33/+33
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-1525-134/+143
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-1514-59/+59
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #8955 from wasamasa/fix-deploy.sh-typoRobert Schilling2015-03-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | Fix typo
| | * | | | | | | | | | | Fix typoVasilij Schneidermann2015-03-141-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-mr-notes' into 'master'Dmitriy Zaporozhets2015-03-142-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pre-wrap for diff code in discussion view This prevents merge request comments from being hidden in discussion view. See #2017. ### Before ![diff_comment_before](https://dev.gitlab.org/Okada/gitlabhq/uploads/e6d24987b8d88f4e8a5883645d569b56/diff_comment_before.png) ### After ![diff_comment_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/fc035f9fc44718dc8424d3f8b54f0953/diff_comment_after.png) This change doesn't affect the "Changes" tab: ![diff_view_comment](https://dev.gitlab.org/Okada/gitlabhq/uploads/9975d4c3feac629d6a0d76b5a0ef43d8/diff_view_comment.png) cc @sytse See merge request !1700
| * | | | | | | | | | | Use pre-wrap for diff code in discussion viewVinnie Okada2015-03-142-0/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'more-flatly'Dmitriy Zaporozhets2015-03-143-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Return some merge widget styles and make it more compactDmitriy Zaporozhets2015-03-143-9/+9
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'resetyle-import' into 'master'Dmitriy Zaporozhets2015-03-142-25/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restyle import Render import providers in one line and make it buttons See merge request !1699
| * | | | | | | | | | | | Improve import buttons on new project pageDmitriy Zaporozhets2015-03-142-25/+23
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'more-flatly' into 'master'Dmitriy Zaporozhets2015-03-1463-172/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More flatly * use sass variables for repeating colors * use more of Flatly theme variables * refactor buttons See merge request !1698
| * | | | | | | | | | | Improve compare switch buttonDmitriy Zaporozhets2015-03-141-7/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Refactor buttonsDmitriy Zaporozhets2015-03-1448-106/+92
| |/ / / / / / / / / /
| * | | | | | | | | | Use sass variabled for backgroung and border colorsDmitriy Zaporozhets2015-03-139-25/+33
| | | | | | | | | | |
| * | | | | | | | | | Improve css for file actionsDmitriy Zaporozhets2015-03-138-36/+43
|/ / / / / / / / / /
* | | | | | | | | | Update changelog with change to unicorn workers number recommendation.Marin Jankovski2015-03-131-4/+5
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-03-131-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #8954 from pupaxxo/patch-2Robert Schilling2015-03-131-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix typo in CHANGELOG.md
| | * | | | | | | | | Fix typo in CHANGELOG.mdAndrea Ruggiero2015-03-131-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-130-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'fix_tests' into 'master'Douwe Maan2015-03-132-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing tests Revert the last merge, as it breaks the master and I didn't see that this line is used in hooks as well when I merged this. See merge request !390
| | * | | | | | | | | | Revert "Merge branch 'follow-on-mr376' into 'master'"Hannes Rosenögger2015-03-132-1/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 07f9a3f928d39accf876d052b265844f74130099, reversing changes made to 4803675190833cdf7e83558a32b2f2ea3283dce0. Reverted this because the data is used in hooks as well.
| * | | | | | | | | | Merge branch 'follow-on-mr376' into 'master'Hannes Rosenögger2015-03-132-3/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow on to MR 376 Follow-on to MR 376 from @haynes . Remove unnecessary fetch of commit messages for initial push. This will reduce the memory usage significantly. See merge request !387
| | * | | | | | | | | Remove unnecessary fetch of commit messages for initial push. This will ↵Elliot2015-03-132-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce the memory usage significantly.
* | | | | | | | | | | Change default number of unicorn workers to three.Marin Jankovski2015-03-132-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ldap-unblock-user' into 'master'Dmitriy Zaporozhets2015-03-133-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unblock user if they were unblocked in AD. Fixes problem with !1687. See merge request !1694
| * | | | | | | | | | Unblock user if they were unblocked in AD.Douwe Maan2015-03-133-2/+12
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bump-gitlab-git' into 'master'Dmitriy Zaporozhets2015-03-132-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab_git to 7.1.1 Verify found object is actually a commit in Commit.find. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1204 See merge request !1696
| * | | | | | | | | | Bump gitlab_git to 7.1.1Dmitriy Zaporozhets2015-03-132-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify found object is actually a commit in Commit.find
* | | | | | | | | | | Merge branch 'fix-encoding' into 'master'Dmitriy Zaporozhets2015-03-134-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor cleanup around UTF-8 encoding. Minor cleanup to be merged after https://dev.gitlab.org/gitlab/gitlab_git/merge_requests/24 is merged in. See merge request !1642
| * | | | | | | | | | Reuse blob object fetched by Gitlab::Git::Blame.Douwe Maan2015-03-131-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Everything from gitlab_git is already UTF-8.Douwe Maan2015-03-133-5/+5
| |/ / / / / / / / /