summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Link cross-project cross-reference notes to correct project.Douwe Maan2015-04-245-40/+15
| * | | No longer needed to pass project argument to commit methods.Douwe Maan2015-04-247-26/+22
| * | | Use project.commit convenience method.Douwe Maan2015-04-248-9/+9
| * | | Let commit model know about its project.Douwe Maan2015-04-2410-22/+29
| |/ /
* | | Merge pull request #9065 from rumpelsepp/issuesDmitriy Zaporozhets2015-04-244-46/+39
|\ \ \ | |/ / |/| |
| * | 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-2421-53/+127
|\ \ \
| * | | Remove unnecessary private_token params.atom-feeds-everywhereDouwe Maan2015-04-237-7/+7
| * | | Rename "News Feed" buttons to "Activity Feed"Douwe Maan2015-04-233-3/+3
| * | | Fix project atom link tag.Douwe Maan2015-04-231-1/+1
| * | | Make links and titles of atom feeds consistent.Douwe Maan2015-04-2311-31/+31
| * | | Add atom feed for project activity.Douwe Maan2015-04-233-5/+37
| * | | Move activity feed buttons out of event_filter into actual show views.Douwe Maan2015-04-234-14/+20
| * | | Add feed button to dashboard and group issue pages.Douwe Maan2015-04-232-0/+12
| * | | Add atom link tag to every page that has one.Douwe Maan2015-04-239-10/+34
* | | | Fix align of issue status box with close/edit buttons to the rightDmitriy Zaporozhets2015-04-241-1/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-241-23/+24
|\ \ \ \
| * \ \ \ Merge branch 'rs-update-d3-atwho' into 'master'Robert Speicher2015-04-231-23/+24
| |\ \ \ \
| | * | | | Fix GfmAutoComplete for jquery-atwho 1.0rs-update-d3-atwhoRobert Speicher2015-04-231-23/+24
| | | |_|/ | | |/| |
* | | | | Merge branch 'rs-mentionable-examples-refactor' into 'master'Dmitriy Zaporozhets2015-04-231-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Note#cross_reference_exists? should be checking the noteable_type alsoRobert Speicher2015-04-161-2/+2
* | | | | Use fixed width icons in all nav sidebarsRobert Speicher2015-04-238-56/+55
| |/ / / |/| | |
* | | | Improve navbar toggle for mobile devicesDmitriy Zaporozhets2015-04-232-13/+3
| |/ / |/| |
* | | Fix sidebar collapse buttonDmitriy Zaporozhets2015-04-231-3/+3
* | | Add CHANGELOG item for new sidebarDmitriy Zaporozhets2015-04-231-1/+4
View Lorry Controller Status