summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add width to caret to rid ourselves of the shiftfixed-width-caretJacob Schatz2016-11-041-1/+1
| | | | | | | | | | Add CHANGELOG uses fa-fw from font awesome instead of using declaring fix width explicitly moves changelog entry under 8.14 rebased with master
* Merge branch '22947-fix_issues_atom_feed_url' into 'master' Rémy Coutable2016-11-046-9/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues atom feed url reflect filters on dashboard Makes the issue atom feed url reflect the selected filters on the issue dashboard page and project's issues page. ## Are there points in the code the reviewer needs to double check? The solution isn't based on javascript and filters functionality but on the current url parameters. It didn't seem right especially when writing tests. ## Why was this MR needed? After filtering the issues, users may press the feed button and see a different list of issues to what is shown on the HTML page Closes #22947 See merge request !7259
| * Issues atom feed url reflect filters on dashboard22947-fix_issues_atom_feed_urlLucas Deschamps2016-11-036-9/+9
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '24022-update-styling-commit-sha-in-branches-list' into 'master' Fatih Acet2016-11-042-1/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated styling commit SHA on branches page ## What does this MR do? Updated styling of commit SHA on the branches page to include the commit icon and be blue ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? to make the branches page in line with upcoming update to the commit list, which also styles the commit sha, but slightly different. ## Screenshots (if relevant) before: ![image](/uploads/ce6eae30d0a07be2d76881d3c5e04e7d/image.png) after: ![image](/uploads/a10df4fe6efbb168fc9b51ae87f53da7/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24022 See merge request !7219
| * | Update commits.scss24022-update-styling-commit-sha-in-branches-listDimitrie Hoekstra2016-11-041-1/+1
| | |
| * | updated styling commit SHA on branches page + added to changelogDimitrie Hoekstra2016-11-042-1/+18
| | |
* | | Merge branch '23979-show-environment-log' into 'master' Sean McGivern2016-11-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show log corresponding to env in admin/logs Closes #23979 See merge request !7191
| * | | Show log corresponding to env in admin/logsLukas Erlacher2016-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No matter which environment Gitlab was running as, the admin/logs view always showed production.log. This commit selects the logfile based on Rails.env. - Rename ProductionLogger to EnvironmentLogger - Make EnvironmentLogger logfile depend on env - Update spinach test for log tabs
* | | | change build list height to show 6,5 builds + improve padding of list, with ↵24017-long-build-list-dropdowns-which-scroll-are-not-immediately-obviousDimitrie Hoekstra2016-11-041-1/+9
| |/ / |/| | | | | | | | first/last child selectors
* | | Cleaned up global namespace JSJosé Iván2016-11-039-139/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix-invalid-filename-eslint' into 'master' Alfredo Sumaran2016-11-042-182/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 jquery.timeago.js to application.jsAlfredo Sumaran2016-11-031-0/+1
| | | |
| * | | Move jquery.timeago to vendor directoryAlfredo Sumaran2016-11-031-182/+0
| |/ /
* | | Merge branch '22914-mini-graph-icons' into 'master' Fatih Acet2016-11-036-4/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-036-4/+19
| | |/ | |/|
* | | Merge branch 'project-container-repo-disable' into 'master' Fatih Acet2016-11-032-3/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | 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 ↵Sean McGivern2016-11-032-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-032-2/+3
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'group-name-validation' into 'master' Alfredo Sumaran2016-11-0318-170/+220
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0214-17/+17
| | |
| * | 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-012-3/+5
| | |
| * | Upgrade gl_field_errors to support more use cases.Bryce Johnson2016-11-015-37/+82
| | |
* | | Merge branch 'sortable-version-update' into 'master' Fatih Acet2016-11-021-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Sortable JS plugin ## What does this MR do? Updates Sortable JS plugin for issue boards. The older version stopped the issue cards being draggable. ## What are the relevant issue numbers? Closes #23048 See merge request !6734
| * | | Updated Sortable JS pluginsortable-version-updatePhil Hughes2016-11-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue in Safari that stops issues from being draggable Closes #23048
* | | | Merge branch 'post_receive-spaces' into 'master' Rémy Coutable2016-11-021-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes spaces in log messages. refs: - 6f7ccea6686d4cc6c6241bc4289c13ff04cc8557 - 7121a58eb9e4dcb63d762e17a668f3bb4b0eaa85 - f54bf00309e310cabb2fec55d860f0670f3b79ac none of them seem to have added extra space deliberately (commit message is about something else) ## Why was this MR needed? The spaces caused confusion when trying to analyze the logs, there was no space in user name, but log message indicated there was. See merge request !7223
| * | | | remove extra spaces from app/workers/post_receive.rbElan Ruusamäe2016-11-011-3/+3
| | | | |
* | | | | Merge branch 'boards-filter-zindex' into 'master' Annabel Dunstone Gray2016-11-021-5/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed z-index for filters on issue boards ## What does this MR do? I dont know how this is has only just become a problem, but when the sidebar is open the filters on issue boards overlap it. ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-11-02_at_09.50.59](/uploads/430ec15249b866999e83fe402cd9bd35/Screen_Shot_2016-11-02_at_09.50.59.png) ### After ![Screen_Shot_2016-11-02_at_09.49.40](/uploads/3a417570a874197ce4b66cbfadbf8181/Screen_Shot_2016-11-02_at_09.49.40.png) See merge request !7235
| * | | | | Removed z-index for filters on issue boardsboards-filter-zindexPhil Hughes2016-11-021-5/+0
| | | | | |
* | | | | | Merge branch 'edit-button-wiki' into 'master' Annabel Dunstone Gray2016-11-023-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix edit button in wiki ## What does this MR do? Fix edit button in wiki. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Show Wiki ![wiki_show](/uploads/7633b7de9921cb8abe688a11883b8d1d/wiki_show.png) ### Edit Wiki ![wiki_edit](/uploads/2529bb1d5eb5b33ef97da89e634bb8ad/wiki_edit.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #13444 See merge request !7143
| * | | | | | Fix edit button wikiHiroyuki Sato2016-11-013-7/+7
| | |_|/ / / | |/| | | |
* | | | | | Use the server's base URL without relative URL part when creating links in JIRABrian Kintz2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'patch-6' into 'master' Achilleas Pipinellis2016-11-021-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add container registry images to not exported list See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html ## What does this MR do? Clarify that images are not exported See merge request !7187
| * | | | | | add container registry images to not exported listBen Bodenmiller2016-10-291-0/+1
| | | | | | |
* | | | | | | Merge branch '23713-milestone-dropdown-not-selected' into 'master' Robert Speicher2016-11-021-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Milestone dropdown does not stay selected Closes #23713 See merge request !7117
| * | | | | | | fixes milestone dropdown not select issue23713-milestone-dropdown-not-selectedNur Rony2016-11-011-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changelog entry added adds merge request number adds test for milestone dropdown selected text removes calling unnecessary escape function adds changelog entry in 8.13.2 and removed redundant changelog sections moves changelog entry to 8.14 as there is conflict
* | | | | | | Merge branch 'allow-owner-to-run-ci-builds' into 'master' Rémy Coutable2016-11-021-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow owners to fetch source code in CI builds Due to different way of handling owners of a project, they were not allowed to fetch CI sources for project. This adds a separate code path for handling owners, that are not admins. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23437 See merge request !6943
| * | | | | | | Allow owners to fetch source code in CI buildsallow-owner-to-run-ci-buildsKamil Trzcinski2016-11-011-4/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Due to different way of handling owners of a project, they were not allowed to fetch CI sources for project.