Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-20Merge remote-tracking branch 'origin/master' into cs-warn-on-failureKamil Trzcinski
2016-07-20Merge branch 'remove-csp-sentry-reporting' into 'master' Stan Hu
Fix the Sentry spam from CSP violations by disabling it. ## What does this MR do? Leaves CSP enabled, but without a reporting endpoint for now. This was causing a huge amount of useless errors in our Sentry instance. cc: @stanhu See merge request !5354
2016-07-20Fix the Sentry spam from CSP violations by disabling it.Connor Shea
2016-07-20Merge branch 'wiki-gfm-autocomplete' into 'master' Jacob Schatz
Fixed GFM autocomplete not loading on wiki pages ## What does this MR do? Allows the GFM autocomplete to work on wiki pages. ## What are the relevant issue numbers? Closes #19580 See merge request !5132
2016-07-19Merge branch '19937-fix-wrong-build-elapsed-time' into 'master' Kamil Trzciński
Fix build duration when build is not finished yet ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Fixes #19937. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since it fixes a regression not yet in a stable release (I think) - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5323
2016-07-19Merge branch 'fix/limit-rev-list-count-to-one' into 'master' Douwe Maan
Limit git rev-list output count to one in forced push check ## What does this MR do? It adds `--max-count=1` to the git command used to check for forced push, this way we can have a brief yet indicative output, saving some time used to split the string returned. Credits go to @pacoguzman for pointing me to the command option. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? It could allow for faster check of forced pushes. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/14280#note_13177575 ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - ~~Tests~~ - [ ] ~~Added for this feature/bug~~ - [ ] ~~All builds are passing~~ - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] ~~[Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)~~ See merge request !5352
2016-07-19Merge branch 'rs-issue-19878' into 'master' Douwe Maan
Ensure Owners are included in the scope for authorized_projects Prior, when providing a `min_access_level` parameter to this method, we called `Gitlab::Access.values` instead of `all_values`, mistakenly omitting the `OWNER` level. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878 See merge request !5353
2016-07-19Limit git rev-list output count to one in forced push checkAhmad Sherif
2016-07-19Ensure Owners are included in the scope for authorized_projectsRobert Speicher
Prior, when providing a `min_access_level` parameter to this method, we called `Gitlab::Access.values` instead of `all_values`, mistakenly omitting the `OWNER` level. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878
2016-07-19Merge branch '19847-running-icon' into 'master' Jacob Schatz
Add new CI status icons ## What does this MR do? Adds new CI status icons for every state ## What are the relevant issue numbers? Closes #19847 ## Screenshots (if relevant) ![Screen_Shot_2016-07-19_at_6.58.37_AM](/uploads/ec391b59825f5a4a228d7c77e7485b1e/Screen_Shot_2016-07-19_at_6.58.37_AM.png) See merge request !5280
2016-07-19Merge branch 'feature/rouge-2.0.4' into 'master' Stan Hu
upgrade rouge to 2.0.5 ## What does this MR do? Upgrades Rouge to 2.0.5 ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? New lexers and bugfixes from upstream. ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5351
2016-07-19Merge branch 'clipboard-button' into 'master' Jacob Schatz
Remove white background on clipboard button; position icon ## What does this MR do? Removes white background from clipboard button ## What are the relevant issue numbers? Closes #19098 ## Screenshots (if relevant) ![Screen_Shot_2016-07-18_at_3.12.24_PM](/uploads/4a6a540e1a074e6cf89fb99be1b49f2d/Screen_Shot_2016-07-18_at_3.12.24_PM.png) ![Screen_Shot_2016-07-18_at_8.50.55_PM](/uploads/8c594b6f9a74095b194fe1f634eaf226/Screen_Shot_2016-07-18_at_8.50.55_PM.png) See merge request !5335
2016-07-19Merge branch 'tag-page-updates' into 'master' Jacob Schatz
Fix styling of tag page ## What does this MR do? Fixes tag page UI ## Screenshots (if relevant) Before: ![Screen_Shot_2016-07-18_at_3.09.28_PM](/uploads/575776fe7917321307baf2b8c2b34d75/Screen_Shot_2016-07-18_at_3.09.28_PM.png) After: ![Screen_Shot_2016-07-18_at_3.09.08_PM](/uploads/44f905318c01eb094989cb74bcd4c3c1/Screen_Shot_2016-07-18_at_3.09.08_PM.png) See merge request !5334
2016-07-19Merge branch 'fork-icon' into 'master' Jacob Schatz
New fork icon! ## What does this MR do? We are using the old fork icon for branching only, so this implements our new custom fork icon ## Screenshots (if relevant) ![Screen_Shot_2016-07-15_at_9.22.33_AM](/uploads/05abaffff314e41f582189327bcca6b2/Screen_Shot_2016-07-15_at_9.22.33_AM.png) ![Screen_Shot_2016-07-15_at_9.29.14_AM](/uploads/a08c622c92da00945406bbd4b3497749/Screen_Shot_2016-07-15_at_9.29.14_AM.png) cc @hazelyang See merge request !5276
2016-07-19Use switch statements instead of if/else chains.Connor Shea
2016-07-19Address feedback.Connor Shea
2016-07-19Add with_warnings? method to Pipelines and add tests.Connor Shea
2016-07-19Starting work on the warn_on_failure feature for the MR build status.Connor Shea
2016-07-19Fix alignment of icons on project pageAnnabel Dunstone
2016-07-19Fix ci_status_helper_spec to look for new SVGsAnnabel Dunstone
2016-07-19Merge branch 'fix-help-paths' into 'master' Dmitriy Zaporozhets
Fix help page paths to make sure shortcuts and the UI help page work. Add a test to make sure the help page UI path doesn't break in the future. Fixes #19972 and #19889. cc: @dzaporozhets @rspeicher @lbennett See merge request !5350
2016-07-19use 2.0.5, actually (2.0.4 was a bad release)http://jneen.net/
2016-07-19upgrade rouge to 2.0.4http://jneen.net/
2016-07-19Fix help page paths to make sure shortcuts and the UI help page work.Connor Shea
Add a test to make sure the help page UI path doesn't break in the future. Fix #19972 and #19889.
2016-07-19Merge branch 'rename-repo-files' into 'master' Douwe Maan
Implements the form for renaming the new filename on the file edit page ## What does this MR do? Adds the possibility to edit a filename when editing the content of a file on Gitlab this MR was made to solve #5850 ![Screen_Shot_2016-07-01_at_16.45.53](/uploads/eeed05800e3dc11f1e3840e0e4fa06b5/Screen_Shot_2016-07-01_at_16.45.53.png) See merge request !5049
2016-07-19Merge branch 'allow-deploy-key-to-download-public-projects' into 'master' Rémy Coutable
Allow to pull code with deploy key from public projects ## What does this MR do? With deploy keys you can download any public projects stored in GitLab. ## What are the relevant issue numbers? Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/1217 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5316
2016-07-19Merge branch 'fix/import-export-project-avatar' into 'master' Rémy Coutable
Project avatar import/export functionality Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19851 Adds logic to export and import a project avatar - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5273
2016-07-19fixes an issue cause by a bad mergetiagonbotelho
2016-07-19Vertically align status icon within tableAnnabel Dunstone
2016-07-19Add new icons for every CI statusAnnabel Dunstone
2016-07-19Merge branch 'fix-retries-on-old-builds' into 'master' Rémy Coutable
Use value of `yaml_variables` and `when` from config_processor if undefined ## What does this MR do? Uses `yaml_variables` and `when` from config_processor if values for these are undefined. ## Why was this MR needed? Old builds doesn't have this columns initialised. Thus makes the retries on these builds to not work properly. This is regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5296. ## Does this MR meet the acceptance criteria? - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) See merge request !5342
2016-07-19Merge branch 'note-form-login-link-referer' into 'master' Fatih Acet
Added redirect_to_referer to login link on issues ## What does this MR do? Adds a `redirect_to_referer` param to login & register links on issues when not logged in. This makes the login box redirect back to the issue after login. ## What are the relevant issue numbers? Closes #19968 See merge request !5344
2016-07-19Add global style for running iconAnnabel Dunstone
2016-07-19Align running icon in merge requestAnnabel Dunstone
2016-07-19Add new running icon; add a bunch of styles to get svg to match existing fa ↵Annabel Dunstone
icons
2016-07-19Improve code designKamil Trzcinski
2016-07-19Fix broken builds_for_refKamil Trzcinski
2016-07-19Move when tests before to make it no conflict with manual-actionsKamil Trzcinski
2016-07-19Use value of `yaml_variables` and `when` from config_processor if undefinedKamil Trzcinski
2016-07-19Merge branch 'manual-actions' into 'master' Rémy Coutable
Add support for manual CI actions ## What does this MR do? This implements a `when: manual` which allows a jobs to be marked as manual actions. Manual actions have to be explicitly executed by developers. ## What are the relevant issue numbers? This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 See merge request !5297
2016-07-19Merge branch 'api-cleanup-entities' into 'master' Rémy Coutable
Simplify entities for branches and tags API ## What does this MR do? As talked in !5208, I improved the entity for branches and tags. ## Does this MR meet the acceptance criteria? ~~- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ ~~- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ ~~- [ ] API support added~~ ~~- Tests~~ ~~- [ ] Added for this feature/bug~~ ~~- [ ] All builds are passing~~ ~~- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)~~ ~~- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)~~ ~~- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)~~ See merge request !5343
2016-07-19Merge branch '19751-branch-tag-icons' into 'master' Fatih Acet
Resolve "Add icons for branch and tag in pipeline list" ## What does this MR do? Adds branch or tag icon on pipeline ref ## What are the relevant issue numbers? Closes #19751 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-13_at_1.42.54_PM](/uploads/d90706a76cf87a6cc8c25dca9a71affa/Screen_Shot_2016-07-13_at_1.42.54_PM.png) With icons closer to tag/branch name/sha: ![Screen_Shot_2016-07-15_at_11.23.48_AM](/uploads/411338f811bafbd314dbab5553fa46d4/Screen_Shot_2016-07-15_at_11.23.48_AM.png) See merge request !5239
2016-07-19Add CHANGELOG entry [ci skip]Kamil Trzcinski
2016-07-19CHANGELOG itemPhil Hughes
2016-07-19Merge branch 'deployment-tracking' into 'master' Rémy Coutable
Added Rake task for tracking deployments ## What does this MR do? This MR adds a Rake task to track the current version of GitLab in InfluxDB. ## Are there points in the code the reviewer needs to double check? We may want to document this Rake task in some Markdown file, but I'm not sure what the best place for this would be. ## Why was this MR needed? We want to have a more accurate overview of when deployments occurred. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/infrastructure/issues/98 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] ~~API support added~~ - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5320
2016-07-19fix specJames Lopez
2016-07-19Added redirect_to_referer to login link on issuesPhil Hughes
Closes #19968
2016-07-19Merge branch 'api-delete-todos' into 'master' Rémy Coutable
Api delete todos ## What does this MR do? It changes the `DELETE /todos` to only return the number of marked todos. ## Why was this MR needed? Before it returned the marked todos as an paginated array. Since we deleted/marked the todos, there was no way to get the rest of the todos. ## What are the relevant issue numbers? Closes #19678 ## Does this MR meet the acceptance criteria? ~~- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5341
2016-07-19Simplify entities for branches and tags APIRobert Schilling
2016-07-19Added Rake task for tracking deploymentsYorick Peterse
This simply inserts the current GitLab version in the "deployments" measurement. Fixes gitlab-com/infrastructure#98
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-18 19:55:21 +0300