summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix bad conflict resolutionLin Jen-Shin2017-07-042-11/+13
* Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-04123-1252/+1647
|\
| * Merge branch 'sh-allow-force-repo-create' into 'master'Sean McGivern2017-07-031-10/+10
| |\
| | * Change the force flag to a keyword argumentsh-allow-force-repo-createDouglas Barbosa Alexandre2017-07-031-2/+2
| | * Make Project#ensure_repository force create a repoStan Hu2017-06-301-10/+10
| * | Merge branch 'add-ci_variables-environment_scope' into 'master'Kamil Trzciński2017-07-031-1/+1
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...add-ci_variables-environment_scopeLin Jen-Shin2017-07-0488-524/+896
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...Lin Jen-Shin2017-06-29187-2529/+3724
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...Lin Jen-Shin2017-06-27159-2413/+3486
| | |\ \ \ \
| | * | | | | Add environment_scope column to ci_variables tableLin Jen-Shin2017-06-211-1/+1
| * | | | | | Merge branch '32885-unintentionally-removing-branch-when-merging-merge-reques...Grzegorz Bizon2017-07-031-2/+1
| |\ \ \ \ \ \
| | * | | | | | Set force_remove_source_branch default to false.32885-unintentionally-removing-branch-when-merging-merge-requestBryce Johnson2017-07-021-2/+1
| * | | | | | | Merge branch '32048-shared-runners-admin-buttons-have-odd-spacing' into 'master'Clement Ho2017-07-032-7/+27
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Replace existing runner links with icons and tooltips, move into btn-group.32048-shared-runners-admin-buttons-have-odd-spacingBryce Johnson2017-07-032-7/+27
| * | | | | | | Merge branch 'fix-2801' into 'master'Sean McGivern2017-07-033-2/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Reset @full_path to nil when cache expiresDouglas Barbosa Alexandre2017-07-031-0/+1
| | * | | | | | | Expires full_path cache after repository is transferredDouglas Barbosa Alexandre2017-06-291-0/+1
| | * | | | | | | Expires full_path cache after project is renamedDouglas Barbosa Alexandre2017-06-292-2/+10
| * | | | | | | | Merge branch '29000-recaptcha-margin' into 'master'Filipa Lacerda2017-07-031-1/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | add margin between captcha and register button29000-recaptcha-marginSimon Knox2017-07-031-1/+1
| * | | | | | | | Merge branch '34116-milestone-filtering-on-group-issues' into 'master'Sean McGivern2017-07-032-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Change milestone endpoint for groupsTakuya Noguchi2017-06-271-0/+2
| | * | | | | | | | Add JSON support to group milestonesTakuya Noguchi2017-06-271-0/+3
| * | | | | | | | | Adjust readme repo widthDimitrie Hoekstra2017-07-034-6/+11
| * | | | | | | | | Resolve "Issue Board -> "Remove from board" button when viewing an issue give...Luke "Jared" Bennett2017-07-033-4/+7
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'set-sidebar-height' into 'master'Tim Zallmann2017-07-023-46/+38
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Make setSidebarHeight more efficient with SidebarHeightManager.set-sidebar-heightBryce Johnson2017-06-303-46/+38
| * | | | | | | | Merge branch 'enable-webpack-code-splitting' into 'master'Jacob Schatz2017-06-308-58/+104
| |\ \ \ \ \ \ \ \
| | * | | | | | | | configure webpack publicPath dynamically to account for CDN or relative path ...Mike Greiling2017-06-282-15/+20
| | * | | | | | | | move webpack publicPath setup earlier in the bootstrap processes to avoid ES ...Mike Greiling2017-06-283-9/+14
| | * | | | | | | | dynamically import emoji helpers for gl-emoji custom tag prototypeMike Greiling2017-06-281-5/+12
| | * | | | | | | | dynamically import emoji helpers for GfmAutoComplete classMike Greiling2017-06-281-6/+12
| | * | | | | | | | dynamically import emoji helpers for AwardsHandler classMike Greiling2017-06-283-39/+54
| | * | | | | | | | dynamically set webpack publicPath when relative_url_root enabledMike Greiling2017-06-281-0/+8
| * | | | | | | | | Merge branch 'fix-assigned-issuable-lists' into 'master'Annabel Dunstone Gray2017-06-302-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add issuable-list class to shared mr/issue lists to fix new responsive layoutfix-assigned-issuable-liststauriedavis2017-06-302-2/+2
| * | | | | | | | | | Merge branch 'restore-timeago-translation' into 'master'Phil Hughes2017-06-301-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Restore timeago translations in renderTimeago.restore-timeago-translationBryce Johnson2017-06-301-1/+1
| | |/ / / / / / / / /
| * | | | | | | | | | New navigation breadcrumbsPhil Hughes2017-06-3018-35/+231
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'bpj-init-timeago-timeout-less-frequently' into 'master'Phil Hughes2017-06-302-22/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove initTimeagoTimeout and let timeago.js update timeagos internally.bpj-init-timeago-timeout-less-frequentlyBryce Johnson2017-06-292-22/+4
| * | | | | | | | | | Merge branch 'speed-up-issue-counting-for-a-project' into 'master'Rémy Coutable2017-06-304-42/+89
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix typo in IssuesFinder commentSean McGivern2017-06-301-1/+1
| | * | | | | | | | | | Make issuables_count_for_state publicspeed-up-issue-counting-for-a-projectSean McGivern2017-06-301-12/+12
| | * | | | | | | | | | Clarify counter caching for users without project accessSean McGivern2017-06-301-0/+15
| | * | | | | | | | | | Make finders responsible for counter cache keysSean McGivern2017-06-303-26/+32
| | * | | | | | | | | | Don't count any confidential issues for non-project-membersSean McGivern2017-06-302-6/+9
| | * | | | | | | | | | Cache total issue / MR counts for project by user typeSean McGivern2017-06-303-25/+34
| | * | | | | | | | | | Only do complicated confidentiality checks when necessarySean McGivern2017-06-302-16/+30
| * | | | | | | | | | | Automatically hide sidebar on smaller screensAnnabel Dunstone Gray2017-06-301-0/+7
View Lorry Controller Status