summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'update-changelog' into 'master'Robert Schilling2015-03-241-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate CHANGELOG items for v7.8.0 [ci skip] See merge request !447
| * | | | | | | | | | Remove duplicate CHANGELOG items for v7.8.0Aurelio Jargas2015-03-241-2/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'fix-nested-tasks' into 'master'Dmitriy Zaporozhets2015-03-244-3/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix nested task lists When nesting task list items, the parent item is wrapped in a `<p>` tag. Update the task list parser to handle these paragraph wrappers. cc @sytse See merge request !413
| * | | | | | | | | Update CHANGELOGVinnie Okada2015-03-221-0/+1
| | | | | | | | | |
| * | | | | | | | | Fix nested task listsVinnie Okada2015-03-213-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When nesting task list items, the parent item is wrapped in a `<p>` tag. Update the task list parser to handle these paragraph wrappers.
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-233-9/+13
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'merge-status-without-timestamps' into 'master'Dmitriy Zaporozhets2015-03-243-9/+13
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't mark merge request as updated when merge status relative to target branch changes. Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1254 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2165. See merge request !431
| | * | | | | | | | | | Don't mark merge request as updated when merge status relative to target ↵merge-status-without-timestampsDouwe Maan2015-03-233-9/+13
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch changes.
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-2311-22/+31
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'notes-count-without-system' into 'master'Dmitriy Zaporozhets2015-03-247-7/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't include system notes in issue/MR comment count. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163. See merge request !430
| | * | | | | | | | | Don't include system notes in issue/MR comment count.notes-count-without-systemDouwe Maan2015-03-237-7/+11
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'improve-diff-header' into 'master'Dmitriy Zaporozhets2015-03-242-11/+12
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file mode going to next line in diff header See merge request !432
| | * | | | | | | | | Fix file mode going to next line in diff headerimprove-diff-headerDmitriy Zaporozhets2015-03-232-11/+12
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'keyword-args-2.0' into 'master'Douwe Maan2015-03-232-4/+8
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use required keyword arguments to maintain support for Ruby 2.0. See merge request !433
| | * | | | | | | | Revert "Update gemnasium-gitlab-service gem"Douwe Maan2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af522ede14cad4605bc7f0137ddf6950974eccce.
| | * | | | | | | | Don't use required keyword arguments to maintain support for Ruby 2.0.Douwe Maan2015-03-231-3/+7
| |/ / / / / / / /
* | | | | | | | | Merge pull request #9006 from hebbet/patch-1Robert Schilling2015-03-231-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Change comment in blue ui to match other scss
| * | | | | | | | Change comment in blue ui to match other scsshebbet2015-03-231-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | Change comment in blue ui to match other scss files
* | | | | | | | Merge branch 'emailsonpush-create-delete' into 'master'Dmitriy Zaporozhets2015-03-237-134/+283
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send EmailsOnPush email when branch or tag is created or deleted. Addresses #1951, #1957 and #1925. ![Screen_Shot_2015-03-17_at_13.58.15](https://dev.gitlab.org/gitlab/gitlabhq/uploads/16ff25adb4b4a7e1923612e0652442b4/Screen_Shot_2015-03-17_at_13.58.15.png) ![Screen_Shot_2015-03-17_at_13.58.22](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e346c1d84aba3a093b722d0a4167e289/Screen_Shot_2015-03-17_at_13.58.22.png) ![Screen_Shot_2015-03-17_at_13.58.28](https://dev.gitlab.org/gitlab/gitlabhq/uploads/720437ecc13f317c6d20eff82ac60bd7/Screen_Shot_2015-03-17_at_13.58.28.png) ![Screen_Shot_2015-03-17_at_13.58.34](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2b302bb6cdbe27c96a8dff1375236602/Screen_Shot_2015-03-17_at_13.58.34.png) See merge request !1709
| * | | | | | | | Clean up code by using keyword arguments.Douwe Maan2015-03-234-16/+28
| | | | | | | | |
| * | | | | | | | Send EmailsOnPush email when branch or tag is created or deleted.Douwe Maan2015-03-187-127/+262
| | | | | | | | |
* | | | | | | | | Merge branch 'no-comment-bubble' into 'master'Dmitriy Zaporozhets2015-03-232-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show commit comment button when user is not signed in. Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167. See merge request !429
| * | | | | | | | | Don't show commit comment button when user is not signed in.Douwe Maan2015-03-232-1/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'userpage-activity-scroll'Dmitriy Zaporozhets2015-03-234-7/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/users_controller.rb
| * | | | | | | | | Fix atom feed for user pageuserpage-activity-scrollDmitriy Zaporozhets2015-03-221-1/+6
| | | | | | | | | |
| * | | | | | | | | Add inifinite scroll to user activity on user pageDmitriy Zaporozhets2015-03-224-6/+17
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-2322-247/+217
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets2015-03-2317-245/+163
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace commits calendar with contributions calendar * count opening of issues and merge requests * dont trigger git repository - use events from database * count pushes instead of commits for faster and easier counting * much-much faster since does not affected by repository size See merge request !420
| | * | | | | | | | | | Improve user calendar testimprove-contributions-calendarDmitriy Zaporozhets2015-03-221-3/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Improve contribution calendar per day infoDmitriy Zaporozhets2015-03-224-30/+5
| | | | | | | | | | | |
| | * | | | | | | | | | Update CHANGELOG with contribution calendarDmitriy Zaporozhets2015-03-221-0/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Contribution calendar will use events instead of commits to count contributionsDmitriy Zaporozhets2015-03-223-14/+12
| | | | | | | | | | | |
| | * | | | | | | | | | Refactor contributions events and write tests for calendarDmitriy Zaporozhets2015-03-227-18/+59
| | | | | | | | | | | |
| | * | | | | | | | | | Fix user controller specsDmitriy Zaporozhets2015-03-221-17/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Refactor repository specsDmitriy Zaporozhets2015-03-221-38/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Replace commits calendar with contributions calendarDmitriy Zaporozhets2015-03-218-155/+104
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * count opening of issues and merge requests * dont trigger git repository - use events from database * much-much faster since does not affected by repository size
| * | | | | | | | | | Merge branch 'fix-admin-service-template-config' into 'master'Douwe Maan2015-03-235-1/+53
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include missing events and fix save functionality in admin service template settings form ### What does this MR do? This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings. ### Are there points in the code the reviewer needs to double check? No. ### Why was this MR needed? Because the service template form was broken and untested. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1275 Before: ![Screen_Shot_2015-03-23_at_5.53.19_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/e1bff75f30a3b6ecb174d3e25c722b7e/Screen_Shot_2015-03-23_at_5.53.19_AM.png) After: ![Screen_Shot_2015-03-23_at_5.53.13_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/8fada00128a3d0951b3230fefa64be92/Screen_Shot_2015-03-23_at_5.53.13_AM.png) See merge request !427
| | * | | | | | | | | | Include missing events and fix save functionality in admin service template ↵Stan Hu2015-03-235-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings form Closes #1275
| * | | | | | | | | | | Merge branch 'upgrade-dockerfile-7.9.0' into 'master'Robert Schilling2015-03-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Docker build to GitLab v7.9.0 See merge request !426
| | * | | | | | | | | | Bump Docker build to GitLab v7.9.0Stan Hu2015-03-231-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-233-11/+16
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #9001 from vichak/masterDouwe Maan2015-03-232-10/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled
| | * | | | | | | | | | | Fix #8966 Remove Milestones/Labels from project navbar when Isses disabledvichak2015-03-232-2/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix #8966 Remove Milestones ans Labels from project navbar when Issues disabledvichak2015-03-231-10/+12
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #8995 from MichaelAlt/patch-1Douwe Maan2015-03-231-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | Faulty LDAP DN name escaping removed
| | * | | | | | | | | | Faulty LDAP DN name escaping removedMichael Alt2015-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Net::LDAP::Filter.escape function can not be used to escape the DN name because the backslash is required to escape special chars in the DN name. This leads to the error message "Access denied for your LDAP account." and prevents the user from logging in to gitlab. Example DN: CN=Test\, User,OU=Organization,DC=Company CN=Test User,OU=Organization,DC=Company http://www.ietf.org/rfc/rfc4514.txt
* | | | | | | | | | | | Merge branch 'your' into 'master'Dmitriy Zaporozhets2015-03-2314-19/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update views to single form of address. Change "my" to "your" Part of user experience. Every software (twitter, facebook etc) talks to you like "change your password" but not "change my password". cc @sytse @job See merge request !1736
| * | | | | | | | | | | Update views to single form of address. Change "my" to "your"Dmitriy Zaporozhets2015-03-2214-19/+17
| | | | | | | | | | | |
* | | | | | | | | | | | Make panel heading font boldDmitriy Zaporozhets2015-03-221-0/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-2217-11/+172
|\ \ \ \ \ \ \ \ \ \ \