summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '13524-keep-around-commits' into 'master' Douwe Maan2016-07-048-5/+73
|\
| * Document Repository#keep_aroundDouwe Maan2016-07-041-4/+8
| * Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-048-5/+69
* | Merge branch 'git-http-kerberos-ce' into 'master' Douwe Maan2016-07-012-4/+44
|\ \
| * | Groundwork for Kerberos SPNEGO (EE feature)Jacob Vosmaer2016-07-012-4/+44
* | | Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-0119-57/+75
|\ \ \ | |_|/ |/| |
| * | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-0119-57/+75
* | | Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master' Robert Speicher2016-07-0133-37/+0
|\ \ \
| * | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-0133-37/+0
* | | | Cache results from jQuery selectors to retrieve namespace nameDouglas Barbosa Alexandre2016-07-011-4/+7
* | | | Fix import button when import fail due the namespace already been takenDouglas Barbosa Alexandre2016-07-012-2/+5
|/ / /
* | | Merge branch '19388-fix-snippets-notes-not-shown' into 'master' Rémy Coutable2016-07-011-1/+1
|\ \ \ | |/ / |/| |
| * | Fix snippets comments not displayed19388-fix-snippets-notes-not-shownRémy Coutable2016-07-011-1/+1
* | | Merge branch 'todos-api' into 'master' Rémy Coutable2016-07-012-0/+32
|\ \ \
| * | | Expose target, filter by state as stringRobert Schilling2016-07-011-0/+21
| * | | Expose action_nameRobert Schilling2016-07-011-0/+11
| * | | Move to helper, no instance variablesRobert Schilling2016-07-012-8/+1
| * | | Add Todos APIDouglas Barbosa Alexandre2016-07-012-1/+8
* | | | Merge branch 'fix/import-export-events' into 'master' Rémy Coutable2016-07-014-0/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | use has_many relationship with eventsJames Lopez2016-07-015-19/+6
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-07-01133-261/+533
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-06-293-14/+5
| |\ \ \ \
| * | | | | fix final line missingJames Lopez2016-06-291-1/+1
| * | | | | fixes and refactored JSON specJames Lopez2016-06-291-1/+1
| * | | | | fixing events for import/exportJames Lopez2016-06-295-0/+19
* | | | | | Merge branch 'cache-autocomplete-results' into 'master' Jacob Schatz2016-07-012-2/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Cache autocomplete resultscache-autocomplete-resultsPhil Hughes2016-07-012-2/+6
| | |_|/ / | |/| | |
* | | | | Improve the request / withdraw access button18310-improve-request-access-buttonRémy Coutable2016-07-016-26/+18
* | | | | Merge branch 'enable-shared-runners-with-admins' into 'master' Rémy Coutable2016-07-015-4/+20
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into enable-shared-runners-wit...Lin Jen-Shin2016-07-01152-395/+816
| |\ \ \ \ \ | | |/ / / /
| * | | | | Disable Metrics/CyclomaticComplexity for Ability.allowedenable-shared-runners-with-adminsLin Jen-Shin2016-06-301-0/+1
| * | | | | Use warning for locked runners:Lin Jen-Shin2016-06-302-2/+2
| * | | | | Use Ability to check pre-requisite. Change back to 403 because:Lin Jen-Shin2016-06-292-2/+14
| * | | | | They're projects, so we shouldn't show lock iconLin Jen-Shin2016-06-281-3/+0
| * | | | | Allow admins to assign locked runners:Lin Jen-Shin2016-06-284-2/+8
| * | | | | Use 409 to indicate that interface might be outdatedLin Jen-Shin2016-06-281-2/+2
| * | | | | Admin should be able to turn shared runners into specific ones:Lin Jen-Shin2016-06-281-1/+1
* | | | | | Merge branch 'avoid-instantiate-tree-for-projects-show-readme-view' into 'mas...Yorick Peterse2016-07-011-1/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Avoid instantiation of a Git::Treeavoid-instantiate-tree-for-projects-show-readme-viewPaco Guzman2016-06-291-1/+6
* | | | | | Merge branch 'improve-system-info' into 'master' Stan Hu2016-07-011-11/+38
|\ \ \ \ \ \
| * | | | | | Catch permission denied errors and ignore the diskimprove-system-infoJosh Frye2016-06-301-11/+38
* | | | | | | Merge branch 'build-reopen-json' into 'master' Gabriel Mazetto2016-06-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Build path sends JSON file pathbuild-reopen-jsonPhil Hughes2016-06-281-1/+1
* | | | | | | | Merge branch 'fix/build-retry-button-in-view' into 'master' Robert Speicher2016-06-301-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Improve method that tells if build is retryableGrzegorz Bizon2016-06-302-2/+2
| * | | | | | | Do not show build retry link when build is activeGrzegorz Bizon2016-06-301-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Make GH one-off auth the default again for importing GH projectsRémy Coutable2016-06-302-16/+22
* | | | | | | Import from Github using Personal Access Tokens.Eric K Idema2016-06-304-25/+62
* | | | | | | Merge branch 'sidebar-breakpoint' into 'master' Jacob Schatz2016-06-302-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Updated breakpoint for sidebar pinningPhil Hughes2016-06-302-2/+2
View Lorry Controller Status