summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-243-2/+3
* 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.Stan Hu2015-04-245-22/+26
* | Merge branch 'rs-simplify-uploads-controller' into 'master'Robert Speicher2015-04-241-5/+2
|\ \
| * | 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 pagesDmitriy Zaporozhets2015-04-245-32/+68
* | | | Merge branch 'username-period-again' into 'master'Douwe Maan2015-04-245-4/+102
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Rename namespace_regex to namespace_path_regex."Douwe Maan2015-04-247-13/+13
| * | | 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
| |/ /
* | | Merge branch 'add_count_to_state_filters' into 'master'Marin Jankovski2015-04-242-3/+17
|\ \ \
| * | | 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.Sytse Sijbrandij2015-03-251-4/+4
* | | | Merge branch 'commit-project' into 'master'Douwe Maan2015-04-2454-205/+218
|\ \ \ \
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | Try to fix tests for pull request #9065Stefan Tatschner2015-04-241-1/+1
| * | | Tweak merge requestsStefan Tatschner2015-04-242-15/+24
| * | | Tweak issue pageStefan Tatschner2015-04-242-31/+15
* | | | Merge branch 'atom-feeds-everywhere' into 'master'Dmitriy Zaporozhets2015-04-2424-57/+133
|\ \ \ \
| * | | | 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
| * | | | Update changelog.Douwe Maan2015-04-231-0/+2
| * | | | Make links and titles of atom feeds consistent.Douwe Maan2015-04-2311-31/+31
| * | | | Add atom feed for project activity.Douwe Maan2015-04-234-8/+40
| * | | | Move activity feed buttons out of event_filter into actual show views.Douwe Maan2015-04-234-14/+20
View Lorry Controller Status