summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-2722-169/+248
|\
| * Merge branch 'fix-gitorious-importer' into 'master'Dmitriy Zaporozhets2015-04-271-1/+1
| |\
| | * Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-241-1/+1
| * | Merge branch 'forked-event' into 'master'Dmitriy Zaporozhets2015-04-274-58/+36
| |\ \
| | * | Use Projects::CreateService to fork projects so that after-create hooks are run.forked-eventDouwe Maan2015-04-244-58/+36
| * | | Merge branch 'rs-minor-styles' into 'master'Dmitriy Zaporozhets2015-04-2716-110/+105
| |\ \ \
| | * | | Place the logo's tooltip dynamicallyrs-minor-stylesRobert Speicher2015-04-252-1/+9
| | * | | Add data-placement attributes for all sidebar linksRobert Speicher2015-04-259-70/+70
| | * | | Add collapsed navbar links to the default tooltip selectorRobert Speicher2015-04-252-5/+1
| | * | | There's no longer a reason to re-render the header on Design updatesRobert Speicher2015-04-251-3/+0
| | * | | Remove the `has_bottom_tooltip` classRobert Speicher2015-04-253-17/+13
| | * | | Fix Profile > Design live-updatingRobert Speicher2015-04-251-1/+1
| | * | | Items with tooltips don't need a 'data-original-title' attributeRobert Speicher2015-04-251-22/+21
| | * | | Don't override color of code blocks in notesRobert Speicher2015-04-251-1/+0
| | * | | Simplify icon style selectorsRobert Speicher2015-04-252-2/+2
| | | |/ | | |/|
| * | | Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractorRobert Speicher2015-04-251-4/+4
| * | | Rename `CommitRange#inclusive?` to `#exclude_start?`Robert Speicher2015-04-251-14/+12
| * | | Remove CommitRange#to_aRobert Speicher2015-04-251-13/+0
| * | | Include caret in CommitRange#reference_titleRobert Speicher2015-04-251-1/+1
| * | | Remove param from CommitRange#to_sRobert Speicher2015-04-251-6/+2
| * | | CommitRange improvementsRobert Speicher2015-04-251-14/+11
| * | | Add CommitRange classRobert Speicher2015-04-251-0/+128
| |/ /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-279-18/+31
|\ \ \
| * \ \ Merge pull request #8644 from Bugagazavr/hook-eventsDmitriy Zaporozhets2015-04-277-15/+21
| |\ \ \
| | * | | Added X-GitLab-Event header for web hooksbugagazavr2015-04-257-15/+21
| | |/ /
| * | | Add notify and color options to HipchatServiceDominik Sander2015-04-262-3/+10
| |/ /
* | | Add new admin settingsVinnie Okada2015-04-2615-63/+73
|/ /
* | Merge branch 'fix-slack-channel-in-admin-settings' into 'master'Douwe Maan2015-04-242-20/+10
|\ \
| * | Fix bug where Slack service channel was not saved in admin template settings.Stan Hu2015-04-242-20/+10
| |/
* | 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-244-32/+67
|\ \ \
| * \ \ Merge branch 'mobile-ui-improvements' into 'master'Dmitriy Zaporozhets2015-04-244-32/+67
| |\ \ \ | | |_|/ | |/| |
| | * | Improve mobile UI for dashboard and project pagesDmitriy Zaporozhets2015-04-244-32/+67
* | | | Merge branch 'username-period-again' into 'master'Douwe Maan2015-04-241-1/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Rename namespace_regex to namespace_path_regex."Douwe Maan2015-04-242-4/+4
| * | | Explain namespace clearn regex.Douwe Maan2015-04-241-0/+5
| * | | Properly migrate users with usernames like "." or "..".Douwe Maan2015-04-241-1/+5
| * | | Rename namespace_regex to namespace_path_regex.Douwe Maan2015-04-242-4/+4
| |/ /
* | | 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 'commit-project' into 'master'Douwe Maan2015-04-2427-136/+148
|\ \ \
| * | | 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-241-4/+4
| * | | Satisfy Rubocop.Douwe Maan2015-04-241-11/+12
| * | | Fix errors.Douwe Maan2015-04-241-2/+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
View Lorry Controller Status