summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix 404 on link pathzj-ref-path-monospaceZ.J. van de Weg2017-08-101-1/+1
|
* Fix line numbers not matching up to code in code viewer.Trevor Flynn2017-08-101-1/+1
|
* Merge branch 'remove-affix-issuable-sidebar-new-nav' into 'master'Filipa Lacerda2017-08-102-1/+4
|\ | | | | | | | | Remove affix plugin from issuable sidebar with new navigation See merge request !13449
| * Remove affix plugin from issuable sidebar with new navigationremove-affix-issuable-sidebar-new-navPhil Hughes2017-08-102-1/+4
| | | | | | | | This isn't required with the new navigation as it is always position fixed so we are just creating a scroll event listener that will never actually do anything
* | Merge branch '36158-new-issue-button' into 'master'Phil Hughes2017-08-102-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Render new issue link in failed job as a regular link instead of a UJS one Closes #36158 See merge request !13450
| * | Render new issue link in failed job as a regular link instead of a UJS one36158-new-issue-buttonFilipa Lacerda2017-08-102-3/+3
| | |
* | | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'Sean McGivern2017-08-101-1/+9
|\ \ \ | | | | | | | | | | | | | | | | Fix conflicting redirect search See merge request !13357
| * | | Remove unnecessary work for MySQLMichael Kozono2017-08-081-1/+9
| | | |
| * | | Fix conflicting redirect searchMichael Kozono2017-08-081-1/+1
| | | |
* | | | Merge branch '36185-or-separator' into 'master'Phil Hughes2017-08-101-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligns OR separater to center properly Closes #36185 See merge request !13446
| * | | | Fix linter error36185-or-separatorFilipa Lacerda2017-08-101-1/+1
| | | | |
| * | | | Aligns OR separater to center properlyFilipa Lacerda2017-08-101-5/+5
| | |_|/ | |/| |
* | | | Merge branch 'remove-unused-redirect_to_external_issue_tracker' into 'master'Rémy Coutable2017-08-101-12/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Remove unused `redirect_to_external_issue_tracker` method See merge request !13444
| * | | Remove unused `redirect_to_external_issue_tracker` methodMehdi Lahmam2017-08-101-12/+0
| |/ / | | | | | | | | | Its usage has been removed at 2fa22a0729.
* | | Merge branch 'fixed-sticky-stats-box-commit-view' into 'master'Filipa Lacerda2017-08-106-14/+23
|\ \ \ | | | | | | | | | | | | | | | | Fix the sticky changes bar on commits page See merge request !13343
| * | | Fix the sticky changes bar on commits pagefixed-sticky-stats-box-commit-viewPhil Hughes2017-08-096-14/+23
| | | |
* | | | Merge branch 'fly-out-fix-hiding' into 'master'Filipa Lacerda2017-08-101-1/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Removed display styles when hiding the fly out navigation Closes #36224 See merge request !13431
| * | | Removed display styles when hiding the fly out navigationfly-out-fix-hidingPhil Hughes2017-08-091-1/+2
| | | | | | | | | | | | | | | | Closes #36224
* | | | Prevent user from changing username with container registry tagsMichael Kozono2017-08-091-0/+8
| | | |
* | | | Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'Robert Speicher2017-08-096-16/+16
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Enable the Layout/SpaceBeforeBlockBraces cop See merge request !13413
| * | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-096-16/+16
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '35996-icon-hover-color' into 'master'Phil Hughes2017-08-091-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update icon color on hover Closes #35996 See merge request !13393
| * | | | Update icon color on hover35996-icon-hover-colorAnnabel Dunstone Gray2017-08-081-0/+4
| | | | |
* | | | | Merge branch 'mr-changes-container-full-width' into 'master'Annabel Dunstone Gray2017-08-092-15/+16
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fixed merge request changes sticky container not spreading full width See merge request !13386
| * | | | Fixed merge request changes sticky container not spreading full widthmr-changes-container-full-widthPhil Hughes2017-08-082-15/+16
| | | | |
* | | | | Merge branch '36179-align-nav-items' into 'master'Phil Hughes2017-08-091-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align all nav items in sidebar Closes #36179 See merge request !13392
| * | | | | Align all nav items in sidebar36179-align-nav-itemsAnnabel Dunstone Gray2017-08-081-1/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-collapsed-sidebar-item-height' into 'master'Phil Hughes2017-08-091-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix height of collapsed sidebar items See merge request !13385
| * | | | | Fix height of collapsed sidebar itemsfix-collapsed-sidebar-item-heightAnnabel Dunstone Gray2017-08-081-2/+5
| |/ / / /
* | | | | Merge branch 'pikaday-undefined-fix' into 'master'Tim Zallmann2017-08-094-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Pikaday being undefined Closes #36207 See merge request !13422
| * | | | | Fix pikaday being undefinedPhil Hughes2017-08-094-5/+5
| | |_|/ / | |/| | | | | | | | | | | | | Closes #36207
* | | | | Merge branch '36119-issuable-workers' into 'master'Sean McGivern2017-08-095-13/+18
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Simplify checking if objects exist code in new issaubles workers Closes #36119 See merge request !13365
| * | | | Simplify checking if objects exist code in new issaubles workers36119-issuable-workersJarka Kadlecova2017-08-085-13/+18
| | | | |
* | | | | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-091-1/+1
| |/ / / |/| | |
* | | | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0818-30/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add rubocop-gitlab-security gem See merge request !12177
| * | | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0818-30/+31
| | | | |
* | | | | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-082-6/+25
| |_|_|/ |/| | |
* | | | Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz2017-08-084-27/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove repo editor feature flag from RC1 See merge request !13379
| * | | | Revert "Add user_dropdown_link to prompt users to turn on new repo"remove-repo-editor-feature-flagMike Greiling2017-08-083-3/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 79f94c8d221f9391f48899808b7a36e3905dab83.
| * | | | hide the feature flag for the repo editor featureMike Greiling2017-08-081-22/+0
| | | | |
| * | | | Revert "Combine 'turn on/off' user dropdown links into 'experimental ↵Mike Greiling2017-08-085-5/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | features' link and andded 'experimental features' heading for user preferences page" This reverts commit 75f490a4c95c41f9364e8e0cba443b312f01a686.
* | | | Merge branch ↵Rémy Coutable2017-08-082-8/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one' into 'master' Resolve "API v4 allows setting a branch that doesn't exist as the default one" Closes #36010 See merge request !13359
| * | | | Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-082-8/+13
| | | | |
* | | | | Merge branch ↵Filipa Lacerda2017-08-085-4/+38
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master' Resolve "'Please select a file' when attempting to upload or replace from the UI" Closes #35052 See merge request !12863
| * | | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-085-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hide placeholder text when files have been added vertically center dropzone area content close modal after file upload succeeds
* | | | | Merge branch 'fly-out-min-width' into 'master'Annabel Dunstone Gray2017-08-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix fly-out width when it has long items See merge request !13371
| * | | | | Fix fly-out width when it has long itemsfly-out-min-widthPhil Hughes2017-08-081-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-083-17/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
| * | | | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-071-1/+1
| | | | | |
| * | | | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-071-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps keep the abstraction layers simpler, and also keep the interface of those methods consistent, in case of implementation changes.