Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build | Shinya Maeda | 2017-12-12 | 2 | -8/+22 |
* | Merge branch 'issue-note-rename' into 'master' | Fatih Acet | 2017-12-11 | 13 | -36/+36 |
|\ | |||||
| * | rename remaining issue_ prefixed filesissue-note-rename | Simon Knox | 2017-12-09 | 13 | -36/+36 |
* | | Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master' | Stan Hu | 2017-12-11 | 2 | -0/+7 |
|\ \ | |||||
| * | | Ignore temporary table in schema | Michael Kozono | 2017-12-11 | 2 | -0/+7 |
* | | | Merge branch 'gitaly-mirroring-prep' into 'master' | Robert Speicher | 2017-12-11 | 4 | -55/+46 |
|\ \ \ | |||||
| * | | | Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prep | Alejandro Rodríguez | 2017-12-06 | 3 | -19/+20 |
| * | | | Add feature flag to use gitaly-ssh mirroring when cloning internal repos | Alejandro Rodríguez | 2017-12-06 | 3 | -38/+28 |
* | | | | Merge branch 'backport-epic-in-issue' into 'master' | Jacob Schatz | 2017-12-11 | 11 | -82/+151 |
|\ \ \ \ | |||||
| * | | | | Backport epic in issueepic-in-issuebackport-epic-in-issue | Clement Ho | 2017-12-07 | 11 | -82/+151 |
* | | | | | Merge branch 'fix_js_style_guide_markup' into 'master' | Rémy Coutable | 2017-12-11 | 1 | -62/+60 |
|\ \ \ \ \ | |||||
| * | | | | | fixes some markup issues in the js style guide docs | Christiaan Van den Poel | 2017-12-11 | 1 | -62/+60 |
|/ / / / / | |||||
* | | | | | Merge branch 'url-utility-es-module' into 'master' | Filipa Lacerda | 2017-12-11 | 50 | -188/+188 |
|\ \ \ \ \ | |||||
| * | | | | | updated importsurl-utility-es-module | Phil Hughes | 2017-12-11 | 14 | -29/+29 |
| * | | | | | Merge branch 'master' into 'url-utility-es-module' | Phil Hughes | 2017-12-11 | 143 | -1094/+2820 |
| |\ \ \ \ \ | |||||
| * | | | | | | fix missed gl.utils.visitUrl spy | Phil Hughes | 2017-12-08 | 1 | -2/+2 |
| * | | | | | | fixed URL being undefined :face_palm: | Phil Hughes | 2017-12-08 | 1 | -2/+2 |
| * | | | | | | remove utl util imports from boards specs | Phil Hughes | 2017-12-08 | 3 | -3/+0 |
| * | | | | | | use exported methods instead of gl.utils | Phil Hughes | 2017-12-08 | 47 | -126/+140 |
| * | | | | | | Moved URL utility methods into es modules | Phil Hughes | 2017-12-08 | 1 | -69/+58 |
* | | | | | | | Merge branch '35724-animate-sidebar' into 'master' | Filipa Lacerda | 2017-12-11 | 12 | -33/+43 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix transitions35724-animate-sidebar | Annabel Dunstone Gray | 2017-12-07 | 1 | -12/+9 |
| * | | | | | | | Fix mobile styles | Annabel Dunstone Gray | 2017-12-07 | 2 | -18/+10 |
| * | | | | | | | Add changelog | Annabel Dunstone Gray | 2017-12-07 | 1 | -0/+5 |
| * | | | | | | | Animate contextual sidebar; change class names for easier readability | Annabel Dunstone Gray | 2017-12-07 | 12 | -35/+51 |
* | | | | | | | | Merge branch 'docs-add-index-to-operations' into 'master' | Achilleas Pipinellis | 2017-12-11 | 4 | -9/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add index for doc/administration/operations/docs-add-index-to-operations | Marcia Ramos | 2017-12-11 | 4 | -9/+19 |
* | | | | | | | | | Merge branch 'add-remove-column-cop' into 'master' | Rémy Coutable | 2017-12-11 | 17 | -0/+118 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add cop for use of remove_columnadd-remove-column-cop | Sean McGivern | 2017-12-11 | 17 | -0/+118 |
* | | | | | | | | | | Merge branch 'bw-fix-key-count-service-spec' into 'master'ch-test-me | Nick Thomas | 2017-12-11 | 1 | -6/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | small change to make less conflict with EE version | Brett Walker | 2017-12-11 | 1 | -6/+4 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'winh-merge-dev-docs' into 'master' | Winnie Hellmann | 2017-12-11 | 1 | -2/+24 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Resolve merge conflicts with dev.gitlab.org/master after security release | Winnie Hellmann | 2017-12-11 | 1 | -2/+24 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master' | Yorick Peterse | 2017-12-11 | 5 | -97/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove RubySampler#sample_objects for performance as well | Stan Hu | 2017-12-11 | 2 | -50/+0 |
| * | | | | | | | | | | Remove allocation tracking code from InfluxDB sampler for performancesh-remove-allocation-tracking-influxdb | Stan Hu | 2017-12-10 | 3 | -47/+5 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'remove_assignee_id' into 'master' | Yorick Peterse | 2017-12-11 | 6 | -4/+90 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add spec for removing issues.assignee_id | Sean McGivern | 2017-12-11 | 3 | -1/+43 |
| * | | | | | | | | | | Improve down step of removing issues.assignee_id column | Sean McGivern | 2017-12-11 | 1 | -1/+9 |
| * | | | | | | | | | | Fix specs after removing assignee_id field | Valery Sizov | 2017-12-11 | 3 | -2/+4 |
| * | | | | | | | | | | Remove issues.assignee_id column | Valery Sizov | 2017-12-11 | 2 | -2/+36 |
* | | | | | | | | | | | Merge branch '40743-bug-accepting-new-group-members-when-permission-level-dev... | Douwe Maan | 2017-12-11 | 5 | -2/+46 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Bugfix: User can't change the access level of an access requester | Rubén Dávila | 2017-12-11 | 5 | -2/+46 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'sh-bump-prometheus-gem-properly' into 'master' | Robert Speicher | 2017-12-11 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Properly bump prometheus-client-mmap gem versionssh-bump-prometheus-gem-properly | Stan Hu | 2017-12-09 | 2 | -2/+2 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'docs/fix-header-level' into 'master' | Achilleas Pipinellis | 2017-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove a header level in the new 'Automatic CE->EE merge' doc | Rémy Coutable | 2017-12-11 | 1 | -1/+1 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'bvl-circuitbreaker-metrics' into 'master' | Douwe Maan | 2017-12-11 | 2 | -2/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Keep track of storage check timings | Bob Van Landuyt | 2017-12-11 | 2 | -2/+25 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master' | Grzegorz Bizon | 2017-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | |