summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-073-4/+173
|\
| * used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-064-12/+3
| * Add persistent flash messagesJose Ivan Vargas2018-03-012-4/+2
| * Changed selector names, address code concernsJose Ivan Vargas2018-03-012-28/+15
| * Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-013-1/+194
* | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-071-26/+2
|\ \
| * | fix specsgitaly-git-mandatoryKim "BKC" Carlbäcker2018-03-071-26/+2
* | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-071-0/+12
|\ \ \
| * | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-071-0/+12
| | |/ | |/|
* | | Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'Sean McGivern2018-03-071-3/+3
|\ \ \
| * | | Fix tests not completely disabling GitalyZeger-Jan van de Weg2018-03-071-3/+3
* | | | Merge branch 'tc-geo-local-only-counts-matcher' into 'master'Nick Thomas2018-03-071-0/+24
|\ \ \ \
| * | | | Add matcher to match elements by idstc-geo-local-only-counts-matcherToon Claes2018-03-061-0/+24
* | | | | Merge branch 'mr-commit-optimization' into 'master'Sean McGivern2018-03-072-7/+5
|\ \ \ \ \
| * | | | | Don't do a commit lookup to present the MR entity, just return the shamr-commit-optimizationAlejandro Rodríguez2018-03-061-4/+2
| * | | | | Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-061-3/+3
* | | | | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-076-505/+502
|\ \ \ \ \ \
| * | | | | | Add discussion APIjprovazn-apiJan Provaznik2018-03-076-505/+502
* | | | | | | Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-072-0/+76
|\ \ \ \ \ \ \
| * | | | | | | Operate on ids to avoid unnecessary loading.Andreas Brandl2018-03-061-2/+2
| * | | | | | | Singularize model name.Andreas Brandl2018-03-062-7/+7
| * | | | | | | Rename to UserInteractedProjects.Andreas Brandl2018-03-062-8/+8
| * | | | | | | Only track contributions if table is available.Andreas Brandl2018-03-062-1/+24
| * | | | | | | Address rubocop offenses.Andreas Brandl2018-03-061-6/+5
| * | | | | | | Treat special cases accordingly.Andreas Brandl2018-03-061-0/+8
| * | | | | | | Cache project/user combinations.Andreas Brandl2018-03-061-3/+4
| * | | | | | | Track which projects a user contributed to.Andreas Brandl2018-03-062-0/+45
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'dz-plugins-project-integrations' into 'master'Dmitriy Zaporozhets2018-03-071-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Add feature test for plugins on system hooks pagedz-plugins-project-integrationsDmitriy Zaporozhets2018-03-061-0/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Count discussions on issues and merge requests as contributions for the contr...Riccardo Padovani2018-03-071-0/+7
* | | | | | | Merge branch '43502-clipboard-btn' into 'master'Phil Hughes2018-03-071-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Removes btn-transparent and btn-clipboard as default classes for clipboard bu...43502-clipboard-btnFilipa Lacerda2018-03-061-0/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'master' into 'master'Grzegorz Bizon2018-03-071-0/+45
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | CI charts now include the current dayDakkaron2018-03-061-0/+45
* | | | | | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-073-17/+49
|\ \ \ \ \ \ \
| * | | | | | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetchStan Hu2018-03-063-17/+49
* | | | | | | | Remove common_vue bundleMike Greiling2018-03-061-6/+7
* | | | | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EEMario de la Ossa2018-03-061-1/+15
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'move-pipeline_default-update_head_pipeline_for_merge_request-qu...Kamil Trzciński2018-03-061-0/+64
|\ \ \ \ \ \ \
| * | | | | | | Move update_head_pipeline_for_merge_request queue to pipeline_processing name...Shinya Maeda2018-03-071-0/+64
* | | | | | | | Merge branch 'sha256-checksum-for-trace' into 'master'Kamil Trzciński2018-03-061-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix false positive spec of using digest instead of hexdigestShinya Maeda2018-03-071-4/+4
| * | | | | | | | Set sha256 checksum when archiving tracesShinya Maeda2018-03-071-0/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'cluster-monitoring-changes-ce-backport' into 'master'Phil Hughes2018-03-062-45/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | prefer checking explicitly for nullMike Greiling2018-03-061-2/+2
| * | | | | | | | replace fixture with simple mount pointMike Greiling2018-03-062-39/+6
| * | | | | | | | add new tests for metrics dashboard changesMike Greiling2018-03-061-9/+34
| * | | | | | | | coerce hasMetrics to a boolean value before instantiating the Vue componentMike Greiling2018-03-061-2/+2
| * | | | | | | | fix karma testsMike Greiling2018-03-061-1/+16
* | | | | | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-0621-384/+833
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |