summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Store only generic message if rebase fails4020-rebase-messageJan Provaznik2018-01-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of storing detailed rebase error, only a generic message is stored with MR. The reason is that this message is exposed and displayed to end user and there is no reason to expose detailed backend information. Error message is still logged so detailed information can be found in logfile by admin if needed. Related #41820
* | | | | | | | | | | | | | Merge branch 'gcp-fix' into 'master'Kamil Trzciński2018-01-115-18/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GCP redirect Closes #41867 See merge request gitlab-org/gitlab-ce!16355
| * | | | | | | | | | | | | | Update links for GCP instructionsgcp-fixFabio Busatto2018-01-111-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix breadcumb of clusters show pageKamil Trzciński2018-01-111-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change failed GCP billing check wordingMatija Čupić2018-01-111-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use new tab for link in flashMatija Čupić2018-01-111-2/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix link to billingKamil Trzciński2018-01-102-2/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix billing checkingKamil Trzciński2018-01-103-4/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Extract GCP billing check as methodMatija Čupić2018-01-101-9/+20
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'qa/gb/validate-qa-selectors' into 'master'Rémy Coutable2018-01-114-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate GitLab QA selectors Closes gitlab-qa#58 See merge request gitlab-org/gitlab-ce!16109
| * | | | | | | | | | | | | | Fix using wrong `Your projects` link in QA testsqa/gb/validate-qa-selectorsGrzegorz Bizon2018-01-102-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix QA selector class used to click on QA elementsGrzegorz Bizon2018-01-101-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add QA selectors coupling with sidebar menuGrzegorz Bizon2018-01-091-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add QA page views / elements couling with the menuGrzegorz Bizon2018-01-093-6/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'admin-dispatcher' into 'master'Filipa Lacerda2018-01-1116-22/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Admin dispatcher JS imports See merge request gitlab-org/gitlab-ce!16315
| * | | | | | | | | | | | | | | Uses `callDefault`admin-dispatcherPhil Hughes2018-01-111-11/+33
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Admin dispatcher JS importsPhil Hughes2018-01-1116-22/+71
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'dispatcher-dashboard-activities' into 'master'Filipa Lacerda2018-01-112-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dashboard activities path See merge request gitlab-org/gitlab-ce!16361
| * | | | | | | | | | | | | | | Refactor dashboard activities pathdispatcher-dashboard-activitiesClement Ho2018-01-102-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dispatcher-sessions' into 'master'Phil Hughes2018-01-115-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher sessions path See merge request gitlab-org/gitlab-ce!16362
| * | | | | | | | | | | | | | | Fix importClement Ho2018-01-101-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Refactor dispatcher sessions pathClement Ho2018-01-105-6/+14
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'dispatcher-search' into 'master'Phil Hughes2018-01-113-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher search path See merge request gitlab-org/gitlab-ce!16366
| * | | | | | | | | | | | | | | Refactor dispatcher search pathdispatcher-searchClement Ho2018-01-103-4/+8
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Fix up Web IDE user preference copy and buttonsJose Ivan Vargas2018-01-114-5/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sh-fix-award-emoji-move-issues' into 'master'Grzegorz Bizon2018-01-111-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where award emojis would be lost when moving issues between projects Closes #33423 See merge request gitlab-org/gitlab-ce!16377
| * | | | | | | | | | | | | | Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issuesStan Hu2018-01-101-5/+11
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33423
* | | | | | | | | | | | | | Merge branch '41600-wider-project-readme-on-fixed-layout' into 'master'Annabel Dunstone Gray2018-01-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too narrow project READMEs on fixed layout Closes #41600 See merge request gitlab-org/gitlab-ce!16181
| * | | | | | | | | | | | | | Make project README containers wider on fixed layoutTakuya Noguchi2018-01-031-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '41709-rich-blob-viewer-margins-for-pc' into 'master'Annabel Dunstone Gray2018-01-112-12/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make rich blob viewer wider for PC Closes #41709 See merge request gitlab-org/gitlab-ce!16262
| * | | | | | | | | | | | | | | Make rich blob viewer wider for PCTakuya Noguchi2018-01-102-12/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'explore-dispatcher-refactor' into 'master'Fatih Acet2018-01-103-15/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors the dispatcher for `explore:*`. See merge request gitlab-org/gitlab-ce!16296
| * | | | | | | | | | | | | | | | Code improvements and fix bad conflict mergeexplore-dispatcher-refactorClement Ho2018-01-102-5/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into 'explore-dispatcher-refactor'Clement Ho2018-01-10211-5348/+6080
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | | | | | | | | | | | | | Fix eslintJacob Schatz2018-01-083-13/+11
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into explore-dispatcher-refactorJacob Schatz2018-01-083-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixes duplicationJacob Schatz2018-01-081-16/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Updating dispatcher without code fixesJacob Schatz2018-01-083-410/+357
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Refactor `explore:*`Jacob Schatz2018-01-083-342/+428
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'projects-a-refactor' into 'master'Fatih Acet2018-01-104-7/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | projects:a* dispatcher refactor See merge request gitlab-org/gitlab-ce!16300
| * | | | | | | | | | | | | | | | Fix indention and bad conflict mergeprojects-a-refactorClement Ho2018-01-101-7/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into 'projects-a-refactor'Clement Ho2018-01-10211-5347/+6078
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | | | | | | | | | | | | | Finishes dispatcher `projects:a*` stuff.Jacob Schatz2018-01-083-5/+22
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix `projects:a*` refactor for dispatcherJacob Schatz2018-01-082-2/+11
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-103-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
| * | | | | | | | | | | | | | | | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-errorEric Eastwood2018-01-093-3/+14
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491
* | | | | | | | | | | | | | | | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-102-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Repository#write_ref client-prep take 2 Closes gitaly#793 See merge request gitlab-org/gitlab-ce!16287
| * | | | | | | | | | | | | | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" Carlbäcker2018-01-092-6/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan2018-01-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added LFS badge to merge request files tracked by LFS Closes #41829 See merge request gitlab-org/gitlab-ce!16345
| * | | | | | | | | | | | | | | Added LFS to merge request files tracked by LFSmerge-request-lfs-badgePhil Hughes2018-01-101-0/+3
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41829