summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update UX guidewinh-unify-modalsWinnie Hellmann2017-12-122-14/+16
* Rename recaptcha-dialog to recaptcha-modalWinnie Hellmann2017-12-127-18/+18
* Rename popup-dialog to modalWinnie Hellmann2017-12-1214-67/+61
* Merge branch 'fix_js_style_guide_markup' into 'master'Rémy Coutable2017-12-111-62/+60
|\
| * fixes some markup issues in the js style guide docsChristiaan Van den Poel2017-12-111-62/+60
|/
* Merge branch 'url-utility-es-module' into 'master'Filipa Lacerda2017-12-1150-188/+188
|\
| * updated importsurl-utility-es-modulePhil Hughes2017-12-1114-29/+29
| * Merge branch 'master' into 'url-utility-es-module'Phil Hughes2017-12-11143-1094/+2820
| |\
| * | fix missed gl.utils.visitUrl spyPhil Hughes2017-12-081-2/+2
| * | fixed URL being undefined :face_palm:Phil Hughes2017-12-081-2/+2
| * | remove utl util imports from boards specsPhil Hughes2017-12-083-3/+0
| * | use exported methods instead of gl.utilsPhil Hughes2017-12-0847-126/+140
| * | Moved URL utility methods into es modulesPhil Hughes2017-12-081-69/+58
* | | Merge branch '35724-animate-sidebar' into 'master'Filipa Lacerda2017-12-1112-33/+43
|\ \ \
| * | | Fix transitions35724-animate-sidebarAnnabel Dunstone Gray2017-12-071-12/+9
| * | | Fix mobile stylesAnnabel Dunstone Gray2017-12-072-18/+10
| * | | Add changelogAnnabel Dunstone Gray2017-12-071-0/+5
| * | | Animate contextual sidebar; change class names for easier readabilityAnnabel Dunstone Gray2017-12-0712-35/+51
* | | | Merge branch 'docs-add-index-to-operations' into 'master'Achilleas Pipinellis2017-12-114-9/+19
|\ \ \ \
| * | | | add index for doc/administration/operations/docs-add-index-to-operationsMarcia Ramos2017-12-114-9/+19
* | | | | Merge branch 'add-remove-column-cop' into 'master'Rémy Coutable2017-12-1117-0/+118
|\ \ \ \ \
| * | | | | Add cop for use of remove_columnadd-remove-column-copSean McGivern2017-12-1117-0/+118
* | | | | | Merge branch 'bw-fix-key-count-service-spec' into 'master'ch-test-meNick Thomas2017-12-111-6/+4
|\ \ \ \ \ \
| * | | | | | small change to make less conflict with EE versionBrett Walker2017-12-111-6/+4
|/ / / / / /
* | | | | | Merge branch 'winh-merge-dev-docs' into 'master'Winnie Hellmann2017-12-111-2/+24
|\ \ \ \ \ \
| * | | | | | Resolve merge conflicts with dev.gitlab.org/master after security releaseWinnie Hellmann2017-12-111-2/+24
|/ / / / / /
* | | | | | Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'Yorick Peterse2017-12-115-97/+5
|\ \ \ \ \ \
| * | | | | | Remove RubySampler#sample_objects for performance as wellStan Hu2017-12-112-50/+0
| * | | | | | Remove allocation tracking code from InfluxDB sampler for performancesh-remove-allocation-tracking-influxdbStan Hu2017-12-103-47/+5
* | | | | | | Merge branch 'remove_assignee_id' into 'master'Yorick Peterse2017-12-116-4/+90
|\ \ \ \ \ \ \
| * | | | | | | Add spec for removing issues.assignee_idSean McGivern2017-12-113-1/+43
| * | | | | | | Improve down step of removing issues.assignee_id columnSean McGivern2017-12-111-1/+9
| * | | | | | | Fix specs after removing assignee_id fieldValery Sizov2017-12-113-2/+4
| * | | | | | | Remove issues.assignee_id columnValery Sizov2017-12-112-2/+36
* | | | | | | | Merge branch '40743-bug-accepting-new-group-members-when-permission-level-dev...Douwe Maan2017-12-115-2/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Bugfix: User can't change the access level of an access requesterRubén Dávila2017-12-115-2/+46
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher2017-12-112-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Properly bump prometheus-client-mmap gem versionssh-bump-prometheus-gem-properlyStan Hu2017-12-092-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'docs/fix-header-level' into 'master'Achilleas Pipinellis2017-12-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove a header level in the new 'Automatic CE->EE merge' docRémy Coutable2017-12-111-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'bvl-circuitbreaker-metrics' into 'master'Douwe Maan2017-12-112-2/+25
|\ \ \ \ \ \ \
| * | | | | | | Keep track of storage check timingsBob Van Landuyt2017-12-112-2/+25
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master'Grzegorz Bizon2017-12-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Do not raise when downstream pipeline is createdqa/gb/improve-multi-project-pipeline-omnibus-scriptGrzegorz Bizon2017-12-111-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-1114-46/+231
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| * | | | | Manually add 10.2.4 changelog entriesMichael Kozono2017-12-084-15/+11
| * | | | | Merge branch 'note-preview' into 'security-10-2'Fatih Acet2017-12-082-1/+17
| * | | | | Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-083-0/+21
| * | | | | Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-083-2/+82
View Lorry Controller Status