summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix new branch button specfix-new-branch-button-specSean McGivern2016-11-041-3/+4
| | | | | | | | | 1. We can create the note directly on the issue, rather than attaching it after creation. 2. We need to update the MergeRequestClosesIssues relation to ensure that the issue know that it's closed by the MR. 3. We should also check that the unavailable button is displayed - not just that the available button is displayed.
* Merge branch 'gitlab-ce-cleanup-global-namespace-javascript' into 'master' Alfredo Sumaran2016-11-0410-139/+140
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up global namespace JS Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6229 ## What does this MR do? Cleans up javascript global namespace by moving the functions that were previously on the window.doSomething namespace ## Are there points in the code the reviewer needs to double check? None that I'm aware of ## Why was this MR needed? Improves code maintainability and deals with some of the technical debt ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [X] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Closes #19661 See merge request !7208
| * Cleaned up global namespace JSJosé Iván2016-11-0310-139/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved most of the functions that contained "window.doSomething" that were located at: - app/assets/javascripts/application.js To the following file: - app/assets/javascripts/lib/utils/common_utils.js The functions listed here: - window.ajaxGet - window.split - window.extractLast - window.rstrip - window.disableButtonIfEmptyField - window.disableButtonIfAnyEmptyField - window.sanitize - window.unbindEvents - window.shiftWindow Now will be accessible from the "gl.utils" namespace
* | Merge branch 'patch-9' into 'master' Alfredo Sumaran2016-11-041-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add tip for using Chrome to run and debug teaspoon tests. ## What does this MR do? Documents the approach I use when writing and debugging frontend tests, which is (IMHO) much better than running locally from the command line. See merge request !7257
| * | Add tip for using Chrome to run and debug teaspoon tests.Bryce Johnson2016-11-031-0/+6
| |/
* | Merge branch 'ignore-build-dir-eslint' into 'master' Alfredo Sumaran2016-11-041-1/+1
|\ \ | |/ |/| | | | | | | | | Ignore `builds` directory from eslint Running `rake eslint` locally was including this directory reporting so many errors that are not from our source code. See merge request !7279
| * Ignore builds directory from eslintAlfredo Sumaran2016-11-031-1/+1
|/
* Merge branch 'fix-invalid-filename-eslint' into 'master' Alfredo Sumaran2016-11-045-2/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eslint: Fix invalid filename validation Attempt to fix the following error which is appearing in every new MR since `eslint-plugin-filenames` was introduced. ``` /builds/gitlab-org/gitlab-ce/app/assets/javascripts/gl_field_error.js.es6 2:1 error Filename 'gl_field_error.js.es6' does not match the naming convention filenames/match-regex ``` This was happening because our ES6 files have the following structure `gl_hello_world.js.es6`. So `eslint-plugin-filenames` was considering as base name `gl_hello_world.js` which didn't pass the previous regex `^[a-z_]+$` This new regex allows the following filenames to pass as valid: - `gl_hello_world.js.es6` which base name translates to `gl_hello_world.js` - `gl_foo_bar.js` which base name translates to `gl_foo_bar` - `d3.js` which base name translates to `d3` (especial case, maybe we should move this to the vendor dir and make the regex more specific) See merge request !7281
| * Add CHANGELOG entry fileAlfredo Sumaran2016-11-031-0/+4
| |
| * Add jquery.timeago.js to application.jsAlfredo Sumaran2016-11-031-0/+1
| |
| * Update match-regex to fix filename conventionfix-invalid-filename-eslintAlfredo Sumaran2016-11-031-1/+1
| | | | | | | | This allows us to pass .js.es6 files as valid filenames;
| * Move jquery.timeago to vendor directoryAlfredo Sumaran2016-11-032-1/+1
| |
* | Merge branch '22914-mini-graph-icons' into 'master' Fatih Acet2016-11-037-4/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new icon for skipped builds; show created state in mini graph ![Screen_Shot_2016-11-03_at_1.31.02_PM](/uploads/69be86d59f5939329cd869804e86cb87/Screen_Shot_2016-11-03_at_1.31.02_PM.png) ![Screen_Shot_2016-11-03_at_1.30.46_PM](/uploads/0d568ad94e3f072beb0728b402aa695a/Screen_Shot_2016-11-03_at_1.30.46_PM.png) Closes #22914 See merge request !7276
| * | Remove g from svg colors22914-mini-graph-iconsAnnabel Dunstone Gray2016-11-031-3/+3
| | |
| * | Add new icon for skipped builds; show created state in mini graphAnnabel Dunstone Gray2016-11-037-4/+21
| | |
* | | Merge branch 'project-container-repo-disable' into 'master' Fatih Acet2016-11-033-3/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides registry if project repository is disabled ## What does this MR do? When disabling the projects repository it now hides the container registry as well. ## Screenshots (if relevant) ![Screen_Shot_2016-10-21_at_11.23.29](/uploads/e07d74e0666348748690689ab993f9d8/Screen_Shot_2016-10-21_at_11.23.29.png) ![Screen_Shot_2016-10-21_at_11.23.32](/uploads/e2f0757397a4524eca5aa069c1fabad3/Screen_Shot_2016-10-21_at_11.23.32.png) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_17224181 See merge request !7036
| * | | CHANGELOG itemproject-container-repo-disablePhil Hughes2016-11-011-0/+1
| | | |
| * | | Hides registry if project is disabledPhil Hughes2016-11-012-3/+14
| | | |
* | | | Merge branch 'file-toggle' into 'master' Fatih Acet2016-11-036-14/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify dropdown button styles Unifies dropdown styles across app (use one shade of gray for border, always use caret instead of chevron) Before: ![Screen_Shot_2016-11-02_at_1.39.20_PM](/uploads/f0a2808c97aaa404626631683da32380/Screen_Shot_2016-11-02_at_1.39.20_PM.png) After: ![Screen_Shot_2016-11-02_at_1.39.45_PM](/uploads/cca0d40138d48f11cfc7183b202abad9/Screen_Shot_2016-11-02_at_1.39.45_PM.png) Should affect _all_ dropdowns ![Screen_Shot_2016-11-02_at_1.35.12_PM](/uploads/73874a46d79144a7a854eab57030c2bc/Screen_Shot_2016-11-02_at_1.35.12_PM.png) See merge request !7250
| * | | Unify dropdown button stylesfile-toggleAnnabel Dunstone Gray2016-11-036-14/+16
| | |/ | |/|
* | | Merge branch '24133-custom-signin-text-alignment' into 'master' Fatih Acet2016-11-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom text to column Before: ![Screen_Shot_2016-11-03_at_9.46.27_AM](/uploads/ba26761b1e1a5af30b19aac88c0060a1/Screen_Shot_2016-11-03_at_9.46.27_AM.png) After: ![Screen_Shot_2016-11-03_at_9.46.20_AM](/uploads/a959a30a3e11ab64bb1412e662692f2b/Screen_Shot_2016-11-03_at_9.46.20_AM.png) Closes #24133 See merge request !7269
| * | | Add custom text to column24133-custom-signin-text-alignmentAnnabel Dunstone Gray2016-11-031-2/+2
| |/ /
* | | Merge branch 'build-status-focus-state' into 'master' Alfredo Sumaran2016-11-032-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove underline focus state on statuses Before: ![Screen_Shot_2016-11-02_at_9.21.03_AM](/uploads/60d49c0cde418b45ee245d1a60d6ece7/Screen_Shot_2016-11-02_at_9.21.03_AM.png) After: ![Screen_Shot_2016-11-02_at_9.20.43_AM](/uploads/820c91d961b01d775465671ebceeba98/Screen_Shot_2016-11-02_at_9.20.43_AM.png) See merge request !7244
| * | | Remove underline focus state on statusesbuild-status-focus-stateAnnabel Dunstone Gray2016-11-032-1/+7
| |/ /
* | | Merge branch 'rs-changelog-spec-dry' into 'master' Robert Speicher2016-11-031-36/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | DRY up the bin/changelog specs Depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7252 See merge request !7253
| * | | DRY up the specs for bin/changelogrs-changelog-spec-dryRobert Speicher2016-11-031-36/+20
| |/ /
* | | Merge branch ↵Sean McGivern2016-11-034-3/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24102-cannot-unselect-remove-source-branch-when-editing-merge-request' into 'master' Fixes #24102 See merge request !7267
| * | | Ensure merge request's "remove branch" accessors return booleans24102-cannot-unselect-remove-source-branch-when-editing-merge-requestRémy Coutable2016-11-034-3/+20
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'update-templates-8-14' into 'master' Rémy Coutable2016-11-0316-140/+247
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add and update .gitignore & .gitlab-ci.yml templates for 8.14 Following https://gitlab.com/gitlab-org/gitlab-ce/issues/24134 See merge request !7272
| * | | Add and update .gitignore & .gitlab-ci.yml templates for 8.14Alejandro Rodríguez2016-11-0316-140/+247
| | | |
* | | | Clarify the author field for the changelog documentationRobert Speicher2016-11-031-0/+3
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'group-name-validation' into 'master' Alfredo Sumaran2016-11-0321-174/+225
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds JavaScript validation for group path editing ## What does this MR do? - Prevents group_edit form submission when special characters are included in the new group name - Enhances gl_field_errors to support this use case and be more re-usable. ## Are there points in the code the reviewer needs to double check? **The implementation of validation is here: https://gitlab.com/gitlab-org/gitlab-ce/commit/73d997046cac376ccdbcaac6f183002bc19b9a1f** The rest of the diff for this MR is augmenting gl_field_errors ## Why was this MR needed? - Currently we allow submission and a 500 error is returned. ## Screenshots (if relevant) ![2016-10-21_14.11.21](/uploads/2bef5764d3f2429dd0f900661153eef7/2016-10-21_14.11.21.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23564, https://gitlab.com/gitlab-org/gitlab-ce/issues/19756, https://gitlab.com/gitlab-org/gitlab-ce/issues/19736, https://gitlab.com/gitlab-org/gitlab-ce/issues/23922 See merge request !7041
| * | | Initialize form validation on new group form.group-name-validationBryce Johnson2016-11-021-1/+1
| | | |
| * | | Unchange username_validator.Bryce Johnson2016-11-021-0/+1
| | | |
| * | | Move snake_case to camelCase.Bryce Johnson2016-11-021-2/+2
| | | |
| * | | Change show-gl-field-errors to gl-show-field-errorsBryce Johnson2016-11-0216-19/+19
| | | |
| * | | Fix changelog.Bryce Johnson2016-11-011-45/+1
| | | |
| * | | List gl_field_error as gl_field_errors dep.Bryce Johnson2016-11-011-0/+3
| | | |
| * | | Break out GlFieldError into separate file.Bryce Johnson2016-11-012-166/+165
| | | |
| * | | Add gl field errors to group name edit form.Bryce Johnson2016-11-013-3/+50
| | | |
| * | | Upgrade gl_field_errors to support more use cases.Bryce Johnson2016-11-017-39/+84
| | | |
* | | | Merge branch 'no-include-on-top-level' into 'master' Rémy Coutable2016-11-031-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't include Gitlab::Routing.url_helpers on top-level namespace (fix error for url_for) ## What does this MR do? Tries to fix: ``` ActionView::Template::Error: arguments passed to url_for can't be handled. Please require routes or provide your own implementation ``` One of the failed build: https://gitlab.com/gitlab-org/gitlab-ce/builds/5825797 See merge request !7265
| * | | | Use stubs instead of modifying global statesno-include-on-top-levelLin Jen-Shin2016-11-031-1/+3
| | | | |
| * | | | Try not to include anything globally!Lin Jen-Shin2016-11-031-1/+2
| | | | |
* | | | | Merge branch 'zj-expose-system-hooks' into 'master' Rémy Coutable2016-11-034-16/+44
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Expose more info for SystemHooks See merge request !6964
| * | | | Update docs and test descriptionzj-expose-system-hooksZ.J. van de Weg2016-11-022-5/+6
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Update docs and unexpose tokenZeger-Jan van de Weg2016-11-024-12/+22
| | | | |
| * | | | Be able to POST subscriptions for system hooksZ.J. van de Weg2016-10-312-2/+20
| | | | |
| * | | | Expose more data on the SystemHooks APIZ.J. van de Weg2016-10-311-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now exposed: - push_events - tag_push_events - enable_ssl_verification - token Fixes gitlab-org/gitlab-ce#23307
* | | | | Merge branch 'update-install-guide-8-14' into 'master' Rémy Coutable2016-11-032-2/+207
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update "Installation from source" guide for 8.14.0 Following the steps from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1. See merge request !7271