summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch '17939-osw-patch-support-gfm' into 'master'Sean McGivern2018-04-061-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for patch link extension for commit links on GFM Closes #17939 See merge request gitlab-org/gitlab-ce!18229
| * | | | | | | | Add support for patch link extension for commit links on GFMOswaldo Ferreira2018-04-061-1/+4
| | | | | | | | |
* | | | | | | | | Stop redirecting the page in graph main actionsFilipa Lacerda2018-04-067-213/+269
| | | | | | | | |
* | | | | | | | | Extend API for importing a project export with overwrite supportFrancisco Javier LĂłpez2018-04-0616-6/+451
| | | | | | | | |
* | | | | | | | | Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-063-7/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add alternative archive route Closes #38830 See merge request gitlab-org/gitlab-ce!17225
| * | | | | | | | | Add new repository archive routeJames Ramsay2018-04-062-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add `<project>/-/archive/<ref>/<filename>.<format>` route using the `-` separator to prevent namespace collisions. If the filename is `<project>-<ref>` or the ref is a sha, the sha will be omitted, otherwise the default filename will be used. - deprecate previous archive route `repository/<ref>/archive`
| * | | | | | | | | Add option to suppress archive commit shaJames Ramsay2018-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add append_sha option (defaults true) to provide a method for toggling this feature. Support added to GitLab Workhorse by gitlab-org/gitlab-workhorse!232
* | | | | | | | | | Merge branch ↔Douwe Maan2018-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concern' into 'master' [Rails5] Add `raise: false` to skip_before_action in authenticates_with_two_factor.rb See merge request gitlab-org/gitlab-ce!18221
| * | | | | | | | | | [Rails5] Add `raise: false` to skip_before_action in ↔blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concernblackst0ne2018-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authenticates_with_two_factor.rb Rails 5.0 raises `ArgumentErrror` if an unrecognised callback is skipped. https://github.com/rails/rails/commit/8b88df94ebda2e829782f514ff51caeaf5e694dd This commit adds `raise: false` to the filter.
* | | | | | | | | | | Merge branch 'fix/gb/fix-deployment-platform-for-environment' into 'master'Kamil TrzciƄski2018-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix environment deployment platform filter method See merge request gitlab-org/gitlab-ce!18216
| * | | | | | | | | | | Fix environment deployment platform filter methodGrzegorz Bizon2018-04-061-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'remove-pages-tar-support' into 'master'Kamil TrzciƄski2018-04-061-13/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove support for legacy tar.gz pages artifacts See merge request gitlab-org/gitlab-ce!18090
| * | | | | | | | | | | | Remove support for legacy tar.gz pages artifactsJacob Vosmaer2018-04-031-13/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Implement a new SHA partial for commit listsShah El-Rahman2018-04-063-44/+63
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '43246-checkfilter' into 'master'Sean McGivern2018-04-0610-44/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Show a message when loading the issues / merge requests dashboard without filters" Closes #43246 See merge request gitlab-org/gitlab-ce!17961
| * | | | | | | | | | | | | Fix breadcrumb linksWinnie Hellmann2018-04-063-5/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Increase top margin of illustrationWinnie Hellmann2018-04-041-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed dashboard filtering testsJan Provaznik2018-04-031-3/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Display illustration and message if no filter is selectedWinnie Hellmann2018-04-035-5/+22
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Check if at least one filter is set on dashboardJan Provaznik2018-04-038-35/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When listing issues and merge requests on dasboard page, make sure that at least one filter is enabled. User's id is used in search autocomplete widget instead of username, which allows presetting user in filter dropdowns. Related to #43246
* | | | | | | | | | | | | | Merge branch 'ab-37462-cache-personal-projects-count' into 'master'Yorick Peterse2018-04-064-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache personal projects count. Closes #37462 See merge request gitlab-org/gitlab-ce!18197
| * | | | | | | | | | | | | Remove unused method.Andreas Brandl2018-04-061-6/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Cache personal projects count.Andreas Brandl2018-04-064-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #37462.
* | | | | | | | | | | | | | [Rails5] Update `type_cast_*_database` methodsblackst0ne2018-04-061-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '44939-epic-comment-thread-backports' into 'master'Fatih Acet2018-04-068-33/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Follow-up from "Refactor discussions/notes code"" Closes #44939 See merge request gitlab-org/gitlab-ce!18190
| * | | | | | | | | | | | | Set `noteable_type` to use in notesAppKushal Pandya2018-04-062-0/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Return noteableType from app initial configKushal Pandya2018-04-061-10/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use noteable type map from constantsKushal Pandya2018-04-061-10/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add map for supported noteable typesKushal Pandya2018-04-061-0/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Set noteableType on noteableData as provided from DOM datasetKushal Pandya2018-04-051-1/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use `isInVueNoteablePage` from dom_utilsKushal Pandya2018-04-051-11/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add page helper methods for notesAppKushal Pandya2018-04-051-1/+6
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Add confirmation modal to "Change username"Shah El-Rahman2018-04-065-61/+186
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'issue_44270' into 'master'Sean McGivern2018-04-0617-41/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show issues of subgroups in group-level issue board Closes #44270 See merge request gitlab-org/gitlab-ce!18187
| * | | | | | | | | | | | Fix rubocopissue_44270Felipe Artur2018-04-051-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix rubocopFelipe Artur2018-04-051-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve specs and docsFelipe Artur2018-04-051-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix more specsFelipe Artur2018-04-052-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix specsFelipe Artur2018-04-051-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Show issues of subgroups in group-level issue boardFelipe Artur2018-04-0515-38/+33
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ui-mr-counter-cache' into 'master'Sean McGivern2018-04-062-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleting a MR you are assigned to should decrements counter Closes #44458 See merge request gitlab-org/gitlab-ce!17951
| * | | | | | | | | | | | Deleting a MR you are assigned to should decrements counterm b2018-04-052-5/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge request counter in the UI was not decreasing when a merge request was deleting. This was just due to the cache not being refreshed on a delete action. fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/44458
* | | | | | | | | | | | Merge branch '43976-fix-access-token-clipboard-button-style' into 'master'Phil Hughes2018-04-062-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Access token copy to clipboard button has wrong style" Closes #43976 See merge request gitlab-org/gitlab-ce!17978
| * | | | | | | | | | | | Fix personal access token clipboard button styleFabian Schneider2018-03-252-8/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Polish design of domain verification for Gitlab PagesLukas Eipert2018-04-068-47/+129
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sh-appearance-cache-key-version' into 'master'Douwe Maan2018-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the GitLab version as part of the appearances cache key Closes gitlab-ee#5571 See merge request gitlab-org/gitlab-ce!18211
| * | | | | | | | | | | | | Use the GitLab version as part of the appearances cache keysh-appearance-cache-key-versionStan Hu2018-04-051-1/+1
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents us from having to manually flush the cache key in migrations every time a new column is added. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/5571
* | | | | | | | | | | | | Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera2018-04-0510-19/+47
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-055-38/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct upload of artifacts See merge request gitlab-org/gitlab-ce!18160
| * | | | | | | | | | | | | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil TrzciƄski2018-04-055-38/+44
| | | | | | | | | | | | | |