summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added X-GitLab-Event header for web hooksbugagazavr2015-04-2510-21/+32
|
* Merge pull request #9196 from tonicbupt/fixJeroen van Baarsen2015-04-251-1/+2
|\ | | | | fix redis 3.0.0
| * fix redis 3.0.0tonic2015-04-251-1/+2
| |
* | Merge pull request #9189 from rockneverdies55/patch-1Robert Schilling2015-04-251-1/+1
|\ \ | | | | | | Removed "unreleased" from v7.10 changelog
| * | Removed "unreleased" from v7.10 changelogrockneverdies552015-04-241-1/+1
| |/ | | | | Version 7.10 is already released so "unreleased" text next to it in the changelog file can be removed.
* | Merge branch 'fix-slack-channel-in-admin-settings' into 'master'Douwe Maan2015-04-245-22/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where Slack service channel was not saved in admin template settings Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181 Closes #1501 See merge request !574
| * | Fix bug where Slack service channel was not saved in admin template settings.Stan Hu2015-04-245-22/+26
| | | | | | | | | | | | | | | | | | Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181
* | | Merge branch 'rs-simplify-uploads-controller' into 'master'Robert Speicher2015-04-241-5/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | Simplify the `skip_before_action` logic for UploadsController See merge request !547
| * | Simplify the `skip_before_filter` logic for UploadsControllerrs-simplify-uploads-controllerRobert Speicher2015-04-231-5/+2
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-245-32/+68
|\ \ \
| * \ \ Merge branch 'mobile-ui-improvements' into 'master'Dmitriy Zaporozhets2015-04-245-32/+68
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve mobile UI for dashboard and project pages Some love for mobile UI :smiley: ## Before - - - ![Screenshot_2015-04-24-17-42-59](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/827f9cefa477fc7f0d1b2d56e479a35c/Screenshot_2015-04-24-17-42-59.png) ![Screenshot_2015-04-24-17-27-01](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/698eb90033d40ea7de9f599364a34d0e/Screenshot_2015-04-24-17-27-01.png) ## After - - - ![Screenshot_2015-04-24-17-16-08](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/7e3ad8bc18800f63a7be20ea31ccfd3b/Screenshot_2015-04-24-17-16-08.png) ![Screenshot_2015-04-24-17-39-18](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/cde3379836530d95e94922ba5c200cef/Screenshot_2015-04-24-17-39-18.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !573
| | * | Improve mobile UI for dashboard and project pagesDmitriy Zaporozhets2015-04-245-32/+68
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'username-period-again' into 'master'Douwe Maan2015-04-245-4/+102
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow username to end in period. Fixes #2174 and #2249. cc @jacobvosmaer Please review and test with the GitLab.com dump. See merge request !1786
| * | | Revert "Rename namespace_regex to namespace_path_regex."Douwe Maan2015-04-247-13/+13
| | | | | | | | | | | | | | | | This reverts commit c0116926c743818b2593474946abb40b56d8fefa.
| * | | Explain namespace clearn regex.Douwe Maan2015-04-242-0/+10
| | | |
| * | | Update schema.Douwe Maan2015-04-241-1/+1
| | | |
| * | | Don't attempt to move if original path only contains periods.Douwe Maan2015-04-241-0/+3
| | | |
| * | | Change migration timestamp.Douwe Maan2015-04-241-0/+0
| | | |
| * | | Properly migrate users with usernames like "." or "..".Douwe Maan2015-04-242-1/+9
| | | |
| * | | Rename namespace_regex to namespace_path_regex.Douwe Maan2015-04-247-13/+13
| | | |
| * | | Move changelog item tot 7.11.Douwe Maan2015-04-241-1/+1
| | | |
| * | | Revert "Revert disallowing usernames to end in period."Douwe Maan2015-04-243-2/+79
| |/ / | | | | | | | | | This reverts commit c75c6b840ba9ed82bb01eca52e968c2b0ec985e6.
* | | Merge branch 'add_count_to_state_filters' into 'master'Marin Jankovski2015-04-242-3/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issue and merge request count for state filters. Related to issue #2170 Changes relate to project issues and merge request pages, dashboard and group pages remain the same. See merge request !1747
| * | | Check if project before calling count on issuable.Marin Jankovski2015-04-241-1/+3
| | | |
| * | | Add issue and merge request count for state filters.Marin Jankovski2015-04-242-3/+15
| | | |
* | | | Merge branch 'canonical-source' into 'master'Dmitriy Zaporozhets2015-04-241-4/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | Make source code on GitLab more prominent. See merge request !1741
| * | | Make source code on GitLab more prominent.Sytse Sijbrandij2015-03-251-4/+4
| | | |
* | | | Merge branch 'commit-project' into 'master'Douwe Maan2015-04-2454-205/+218
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link cross-project cross-reference notes to correct project. - Fixes #1431: Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits. - Include commit comments in MR from a forked project. To accomplish this, the Commit model needs to know about its project. Adding this attribute also simplifies a bunch of other methods that deal with a note's target, that previously had to have special logic for when it belonged to a commit. See merge request !554
| * | | | Fix tests.commit-projectDouwe Maan2015-04-241-3/+3
| | | | |
| * | | | Explain purpose and usage.Douwe Maan2015-04-241-0/+24
| | | | |
| * | | | Fix behavior for Enumerable-like ActiveRecord relations.Douwe Maan2015-04-241-3/+1
| | | | |
| * | | | Fix small issues.Douwe Maan2015-04-242-6/+7
| | | | |
| * | | | Satisfy Rubocop.Douwe Maan2015-04-241-11/+12
| | | | |
| * | | | Fix errors.Douwe Maan2015-04-242-3/+2
| | | | |
| * | | | Update changelog.Douwe Maan2015-04-241-0/+2
| | | | |
| * | | | Select MR commit notes from source project.Douwe Maan2015-04-241-3/+6
| | | | |
| * | | | Move participants method to shared Participable concern.Douwe Maan2015-04-245-43/+51
| | | | |
| * | | | Link cross-project cross-reference notes to correct project.Douwe Maan2015-04-249-61/+36
| | | | |
| * | | | No longer needed to pass project argument to commit methods.Douwe Maan2015-04-2410-31/+26
| | | | |
| * | | | Use project.commit convenience method.Douwe Maan2015-04-2430-44/+44
| | | | |
| * | | | Let commit model know about its project.Douwe Maan2015-04-2412-27/+34
| | |/ / | |/| |
* | | | Merge pull request #9065 from rumpelsepp/issuesDmitriy Zaporozhets2015-04-245-47/+40
|\ \ \ \ | |/ / / |/| | | Tweak issue page a bit
| * | | Try to fix tests for pull request #9065Stefan Tatschner2015-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | This crappy test framework stuff fails randomly. So I can't reliably run it on my local machine.
| * | | Tweak merge requestsStefan Tatschner2015-04-242-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Include creation time * Include author without avatar * Move assignee to the right * Include comments counter by default, gray it out when there are 0 comments.
| * | | Tweak issue pageStefan Tatschner2015-04-242-31/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Include creation time * Include author without avatar * Move assignee to the right * Remove action buttons. IMO they are useless and a bit annoying * Include comments counter by default, gray it out when there are 0 comments.
* | | | Merge branch 'atom-feeds-everywhere' into 'master'Dmitriy Zaporozhets2015-04-2424-57/+133
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add project activity atom feed and show atom feed buttons everywhere where applicable. See merge request !555
| * | | | Remove unnecessary private_token params.atom-feeds-everywhereDouwe Maan2015-04-237-7/+7
| | | | |
| * | | | Fix spec.Douwe Maan2015-04-231-1/+1
| | | | |
| * | | | Rename "News Feed" buttons to "Activity Feed"Douwe Maan2015-04-233-3/+3
| | | | |
| * | | | Fix project atom link tag.Douwe Maan2015-04-231-1/+1
| | | | |
View Lorry Controller Status