Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [Rails5] Fix spec/controllers/projects/jobs_controller_spec.rbb-rails5-fix-spec-controllers-projects-jobs_controller_spec-rb | blackst0ne | 2018-05-11 | 1 | -12/+12 |
* | Merge branch '44956-wiki-headings-no-longer-show-anchor-link' into 'master' | Clement Ho | 2018-05-10 | 4 | -7/+12 |
|\ | |||||
| * | Fix missing anchor link on wiki page44956-wiki-headings-no-longer-show-anchor-link | Jose | 2018-05-08 | 4 | -7/+12 |
* | | Merge branch 'bw-fix-sha-attribute' into 'master' | Stan Hu | 2018-05-10 | 2 | -5/+8 |
|\ \ | |||||
| * | | only issue a warning if column doesn't exist | Brett Walker | 2018-05-10 | 2 | -5/+8 |
* | | | Merge branch 'update-gon' into 'master' | Robert Speicher | 2018-05-10 | 2 | -4/+3 |
|\ \ \ | |||||
| * | | | Update gon ~> 6.1.0 to ~> 6.2 | Pirate Praveen | 2018-05-05 | 2 | -4/+3 |
* | | | | Merge branch 'fix/wiki-find-page-invalid-encoding' into 'master' | Robert Speicher | 2018-05-10 | 4 | -1/+31 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix finding wiki pages when they have invalidly-encoded content | Ahmad Sherif | 2018-05-09 | 4 | -1/+31 |
* | | | | Merge branch 'ide-hide-merge-request-if-disabled' into 'master' | Filipa Lacerda | 2018-05-10 | 5 | -1/+26 |
|\ \ \ \ | |||||
| * | | | | fixed specs | Phil Hughes | 2018-05-10 | 2 | -7/+4 |
| * | | | | Hide merge request option in IDE when merge requests are disabled | Phil Hughes | 2018-05-09 | 4 | -1/+29 |
| |/ / / | |||||
* | | | | Merge branch 'jr-46209-web-ide-copy' into 'master' | Tim Zallmann | 2018-05-10 | 2 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | Fix outdated web ide copyjr-46209-web-ide-copy | James Ramsay | 2018-05-10 | 2 | -2/+7 |
* | | | | | Merge branch '41229-include-the-human-repo-name-in-gitlab-shell-log-when-hash... | Nick Thomas | 2018-05-10 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Include project.full_path when moving repo | Ash McKenzie | 2018-05-10 | 1 | -1/+1 |
* | | | | | | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master' | Nick Thomas | 2018-05-10 | 6 | -3/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Support resetting of Prometheus metrics between test runs | Stan Hu | 2018-05-09 | 6 | -3/+41 |
* | | | | | | | Merge branch 'jej/fix-accidental-ee-directory' into 'master' | Dmitriy Zaporozhets | 2018-05-10 | 2 | -51/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove accidental EE additions in CEjej/fix-accidental-ee-directory | James Edwards-Jones | 2018-05-10 | 2 | -51/+0 |
* | | | | | | | | Merge branch 'mk/fix-intermittent-qa-test-failure' into 'master' | Grzegorz Bizon | 2018-05-10 | 2 | -14/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Succeed or fail fast based on job status first | Michael Kozono | 2018-05-08 | 2 | -14/+20 |
* | | | | | | | | | Merge branch '45442-updates-updated-at-to-issue-on-time-spent' into 'master' | Douwe Maan | 2018-05-10 | 4 | -9/+48 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updates updated_at on issue when using /spend quick action | Jacopo | 2018-05-09 | 4 | -9/+48 |
* | | | | | | | | | | Merge branch 'ce-jej/group-saml-skip-forgery-protection' into 'master' | Douwe Maan | 2018-05-10 | 1 | -5/+12 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Backport with_forgery_protection spec helper | James Edwards-Jones | 2018-05-08 | 1 | -5/+12 |
* | | | | | | | | | | Merge branch 'backport-rd-5566-improve-performance-of-repository-size-limit-c... | Douwe Maan | 2018-05-10 | 5 | -17/+55 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Backport some changes from gitlab-ee!5476 | Rubén Dávila | 2018-05-09 | 5 | -17/+55 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '46147-remove-model-redefinition-worker' into 'master' | Douwe Maan | 2018-05-10 | 2 | -149/+95 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | apply feedback | Micaël Bergeron | 2018-05-09 | 1 | -3/+3 |
| * | | | | | | | | | remove the `Upload` redefinition in `MigrateUploadsWorker` | Micaël Bergeron | 2018-05-08 | 2 | -149/+95 |
* | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-issues-references.feature' i... | Robert Speicher | 2018-05-09 | 6 | -254/+272 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Replace the `project/issues/references.feature` spinach test with an rspec an... | blackst0ne | 2018-05-09 | 6 | -254/+272 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-deploy-keys.feature' into 'm... | Robert Speicher | 2018-05-09 | 5 | -144/+130 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Replace the `project/deploy_keys.feature` spinach test with an rspec analog | blackst0ne | 2018-05-09 | 5 | -144/+130 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '46032/cycle-analytics-service-axios' into 'master' | Clement Ho | 2018-05-09 | 2 | -15/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | refactor 'cycle_analytics' to use axios | Paul Slaughter | 2018-05-09 | 2 | -15/+17 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'dm-repository-xcode-project' into 'master' | Robert Speicher | 2018-05-09 | 3 | -3/+41 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add Repository#xcode_project? method | Douwe Maan | 2018-05-09 | 3 | -3/+41 |
* | | | | | | | | | | | Merge branch '46032/deploy-keys-axios' into 'master' | Clement Ho | 2018-05-09 | 4 | -40/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | refactor "deploy_keys" to use axios | Paul Slaughter | 2018-05-09 | 4 | -40/+24 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'fix-project-mirror-data-schema' into 'master' | Douwe Maan | 2018-05-09 | 5 | -2/+78 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'fix-project-mirror-data-schema' | Douwe Maan | 2018-05-09 | 197 | -1728/+1367 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Adds changelog | Tiago Botelho | 2018-05-08 | 1 | -0/+6 |
| * | | | | | | | | | | | Adds unique constraint to ProjectMirrorData project_id index | Tiago Botelho | 2018-05-08 | 2 | -2/+33 |
| * | | | | | | | | | | | Adds not null constraint to ProjectMirrorData's foreign_key project_id | Tiago Botelho | 2018-05-08 | 3 | -2/+41 |
* | | | | | | | | | | | | Merge branch 'jivl-delete-d3-rails-gem' into 'master' | Douwe Maan | 2018-05-09 | 2 | -6/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Removed the d3_rails gem | Jose | 2018-05-09 | 2 | -6/+0 |
* | | | | | | | | | | | | Merge branch 'docs/bdo-inclusive-language-groups-docs' into 'master' | 🚄 Job van der Voort 🚀 | 2018-05-09 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update documentation to use inclusive language, gender neutral name and pronoun. | Brendan O'Leary 🐢 | 2018-05-09 | 1 | -10/+10 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | |