summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'oldrev-in-update-hooks' into 'master' Douwe Maan2016-08-012-4/+7
|\
| * webhooks: include old revision in MR update eventsBen Boeckel2016-08-012-4/+7
* | Merge branch '20294-commit-tooltip' into 'master' Jacob Schatz2016-08-011-0/+4
|\ \
| * | Line tooltip up with icon20294-commit-tooltipAnnabel Dunstone2016-07-261-0/+4
* | | Merge branch 'issue_20063_2' into 'master' Rémy Coutable2016-08-011-2/+6
|\ \ \
| * | | Fix search results for notes without commitsFelipe Artur2016-08-011-2/+6
| | |/ | |/|
* | | Merge branch 'admin-builds' into 'master' Fatih Acet2016-08-013-14/+17
|\ \ \ | |/ / |/| |
| * | Decrease icon container width to help fit all pipeline commit info on two linesadmin-buildsAnnabel Dunstone2016-07-281-1/+1
| * | Add icon containerAnnabel Dunstone2016-07-281-1/+2
| * | Adjust min-widths of pipelines and builds tablesAnnabel Dunstone2016-07-281-1/+5
| * | Add pipeline icon to admin builds; position warning icon after shaAnnabel Dunstone2016-07-282-11/+9
* | | Merge branch 'fix-gh-pull-requests' into 'master' Rémy Coutable2016-08-011-2/+2
|\ \ \
| * | | fixup! Fix attr reader to force the intended values for source and target shasfix-gh-pull-requestsDouglas Barbosa Alexandre2016-07-311-6/+2
| * | | Fix attr reader to force the intended values for source and target shasDouglas Barbosa Alexandre2016-07-311-0/+4
* | | | Merge branch '14202-avoid-line-code-position-calculations' into 'master' Yorick Peterse2016-08-011-4/+3
|\ \ \ \
| * | | | Avoid line_code and position calculation on line partial for plain view14202-avoid-line-code-position-calculationsPaco Guzman2016-08-011-4/+3
| |/ / /
* | | | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-0110-71/+105
|\ \ \ \
| * | | | State specific default sort order for issuableszs2016-08-0110-71/+105
* | | | | Merge branch 'fix/labels-milestones-import' into 'master' Rémy Coutable2016-08-012-2/+14
|\ \ \ \ \
| * | | | | squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-012-2/+14
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-016-24/+62
|\ \ \ \ \
| * | | | | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-011-1/+1
| * | | | | Incorporate feedbackZ.J. van de Weg2016-07-291-1/+9
| * | | | | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-296-24/+54
| | |/ / / | |/| | |
* | | | | Merge branch 'new-issue-button-outline' into 'master' Rémy Coutable2016-08-012-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make "New issue" button in Issue page less obtrusive (!5457)winniehell2016-07-302-2/+2
* | | | | Merge branch 'clarify-deletion-message' into 'master' Robert Speicher2016-07-301-1/+1
|\ \ \ \ \
| * | | | | Clarify which project is deleted to avoid alarmclarify-deletion-messageStan Hu2016-07-291-1/+1
| |/ / / /
* | | | | Merge branch 'reject-merge-conflicts' into 'master' Robert Speicher2016-07-301-1/+7
|\ \ \ \ \
| * | | | | Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-1/+7
| |/ / / /
* | | | | Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-293-6/+8
|/ / / /
* | | | Merge branch 'ability-batch-issue-checking' into 'master' Robert Speicher2016-07-292-0/+38
|\ \ \ \
| * | | | Method for returning issues readable by a userability-batch-issue-checkingYorick Peterse2016-07-292-0/+38
* | | | | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-296-103/+99
|\ \ \ \ \
| * | | | | Enable Rubocop cops for invalid access modifiersrubocop/enable-access-modifiers-copsGrzegorz Bizon2016-07-191-1/+1
| * | | | | Refactor system notes service to make it singletonGrzegorz Bizon2016-07-191-76/+78
| * | | | | Fix private method visibility in container registryGrzegorz Bizon2016-07-191-6/+6
| * | | | | Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-194-20/+14
* | | | | | Check for Ci::Build artifacts at database levelPaco Guzman2016-07-292-1/+2
* | | | | | Bump gitlab_git to speedup DiffCollection iterationsPaco Guzman2016-07-292-2/+2
| |_|/ / / |/| | | |
* | | | | Implement final review comments from @rymai.Timothy Andrew2016-07-297-8/+9
* | | | | Use `Gitlab::Access` to protected branch access levels.Timothy Andrew2016-07-2912-150/+86
* | | | | Authorize user before creating/updating a protected branch.Timothy Andrew2016-07-293-5/+15
* | | | | Have the `branches` API work with the new protected branches data model.Timothy Andrew2016-07-291-2/+32
* | | | | Implement review comments from @axil.Timothy Andrew2016-07-291-14/+12
* | | | | Implement review comments from @dbalexandre.Timothy Andrew2016-07-297-95/+81
* | | | | Favor labels like `Allowed to push` over `Allowed To Push`.Timothy Andrew2016-07-293-8/+8
* | | | | Admins count as masters too.Timothy Andrew2016-07-293-4/+12
* | | | | Make specs compatible with PhantomJS versions < 2.Timothy Andrew2016-07-291-1/+2
* | | | | Humanize protected branches' access levels at one location.Timothy Andrew2016-07-295-7/+30
View Lorry Controller Status