summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Initial terminalterminalJacob Schatz2016-10-037-0/+5990
|
* Merge branch ↵Annabel Dunstone Gray2016-10-012-2/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'AshleyDumaine/gitlab-ce-22494-wide-custom-header-logos-arent-centered' into 'master' Center the header logo _Originally opened at !6507 by @AshleyDumaine._ - - - ## What does this MR do? * Centers the header logo using `relative` positioning on the svg or img in the header-logo ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The custom wide header logos aren't centered after logging in as seen in #22494 ## Screenshots (if relevant) | Before | After | | --------- | ------ | | ![Screen_Shot_2016-09-24_at_3.35.26_PM](/uploads/576db77e0eb299b06d2a5abf341f058f/Screen_Shot_2016-09-24_at_3.35.26_PM.png) | ![Screen_Shot_2016-09-24_at_3.35.51_PM](/uploads/47237b6c28d438a6f255dffb8b3d39d4/Screen_Shot_2016-09-24_at_3.35.51_PM.png) | Signout (for centering comparison): ![Screen_Shot_2016-09-24_at_3.35.59_PM](/uploads/4484313ff5841774769c4737584af7fc/Screen_Shot_2016-09-24_at_3.35.59_PM.png) ## 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 - [ ] 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 #22494 See merge request !6610
| * Fix logo positioning on mobileAshleyDumaine/gitlab-ce-22494-wide-custom-header-logos-arent-centeredAnnabel Dunstone Gray2016-09-301-1/+5
| |
| * Center the header logoAshley Dumaine2016-09-302-1/+6
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix-calendar-spec' into 'master' Jacob Schatz2016-10-011-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed zero padded days to no padded days in date_format ## What does this MR do? Changed zero padded days to no padded days in date_format so that calendar spec tests will pass. Specs were failing because it was looking for `Saturday Oct 01, 2016` when it should have been looking for `Saturday Oct 1, 2016` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Fixes failing test ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - 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 #22861 See merge request !6634
| * | Changed zero padded days to no padded days in date_formatClement Ho2016-10-011-1/+3
|/ /
* | Merge branch '22221-tags-are-not-available-from-repository-compare-view' ↵Fatih Acet2016-10-015-18/+89
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Changed compare dropdowns to dropdowns with search input ## What does this MR do? This changes the compare dropdowns from text inputs, that when clicked, open a dropdown of branches/tags to dropdowns that have a dropdown toggle and an isolated search input. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? This was needed to fix the poor UX highlighted in #22221, where opening the dropdown showed an initially filtered set of results because the dropdown toggle was the dropdown filter itself. The compare page is always loaded with `master` as each branch/tag selection, so when opening the dropdown, it would only show results matching `master`. ## Screenshots (if relevant) ![2016-09-27_18.28.10](/uploads/0ea1d91cb592c6e140ed62c336e77227/2016-09-27_18.28.10.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 you do - 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 #22221 See merge request !6550
| * | Added temporary responsive design22221-tags-are-not-available-from-repository-compare-viewLuke Bennett2016-09-292-12/+56
| | |
| * | Changed compare dropdowns to dropdowns with isolated search inputLuke Bennett2016-09-275-14/+41
| | | | | | | | | | | | Updated compare specs
* | | Merge branch 'create-mr-banner' into 'master' Fatih Acet2016-10-0116-169/+193
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR banner & flash notices updates ### What does this MR do? * Moves the create MR banner below subnav * Changes MR banner background to white * Moves flash notices underneath subnav * Adds container within flash notices to align with content Closes #22767 ### Why was this MR needed? It looked a bit out of place between the two navs & had unneeded spacing. ### Screenshots (if relevant) Before: <img src="/uploads/c1676a1923893a7ba7e1c6d6a50d4ea6/Screen_Shot_2016-09-09_at_7.17.31_PM.png" width="800px"> After: <img src="/uploads/74a2d6c8c43b9a15cd535a2a7adb2685/Screen_Shot_2016-09-28_at_3.41.29_PM.png" width="800px"> Before: <img src="/uploads/285e3de31326c48de43bb48abd4d907c/Screen_Shot_2016-09-29_at_10.57.55_AM.png" width="800px"> After: <img src="/uploads/0877e3e45755e5ca36694c52ad2e6198/Screen_Shot_2016-09-29_at_10.56.04_AM.png" width="800px"> With both alert and broadcast message: ![Screen_Shot_2016-09-29_at_11.06.51_AM](/uploads/ba3963a73b5c82940533c369ec54ec50/Screen_Shot_2016-09-29_at_11.06.51_AM.png) See merge request !6581
| * | | Add flash containers and broadcast messages below subnavcreate-mr-bannerAnnabel Dunstone Gray2016-10-0113-159/+180
| | | |
| * | | Add white background to create MR bannerAnnabel Dunstone Gray2016-10-012-3/+2
| | | |
| * | | Move create MR banner below subnavAnnabel Dunstone Gray2016-10-011-1/+1
| | | |
| * | | Remove contianer from last push widgetAnnabel Dunstone Gray2016-10-011-8/+12
| | |/ | |/|
* | | Merge branch 'cs-frontend-guidelines' into 'master' Jacob Schatz2016-10-012-0/+226
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Frontend Development Guidelines to the Developer Documentation ## What does this MR do? WIP incomplete draft of some Frontend Development Guidelines for contributors to the project, new hires, and for other projects and persons to look to for guidance. These are all subject to removal, modification, etc. If you disagree with any of these, please feel free to voice your concerns :) ## Why was this MR needed? There are a number of guidelines we currently follow implicitly, this makes them more official and available for reference/discussion. It also exists as a reference for certain patterns we use which may be unfamiliar to new contributors, e.g. the per-page JS. Feel free to give feedback on wording, missing sections/guidelines, whether a guideline should even exist, etc. See merge request !5477
| * | | Update Frontend Docs based on feedback.cs-frontend-guidelinesConnor Shea2016-09-211-18/+18
| | | |
| * | | Add a section on vue and one on supported browsers.Connor Shea2016-09-211-0/+14
| | | |
| * | | Add Overview section detailing our frontend stack. [ci skip]Connor Shea2016-09-211-5/+44
| | | |
| * | | Add short Testing section, minor fixes.Connor Shea2016-09-211-1/+7
| | | |
| * | | Add CSP and SRI information [ci skip]Connor Shea2016-09-211-3/+71
| | | |
| * | | Further revisions/additions [ci skip]Connor Shea2016-09-211-6/+17
| | | |
| * | | Add more information on page-specific JS.Connor Shea2016-09-211-19/+45
| | | | | | | | | | | | | | | | [ci skip]
| * | | Initial incomplete draft of the Frontend Development Guidelines.Connor Shea2016-09-212-0/+62
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch '21369-make-it-clearer-that-diffs-can-be-collapsed' into 'master' Jacob Schatz2016-10-016-15/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated diff toggle targets and added icon ## What does this MR do? Adds the new diff toggle icon and alters the toggle targets. User can now click on the file header bar _(where no other elements are above it, apart from the icon)_ and the `Click to expand` link to expand the diff and no where else. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-02_at_15.35.15](/uploads/c1cb8c0547328153250294d6c95dd96a/Screen_Shot_2016-09-02_at_15.35.15.png) #### Gif ![2016-09-02_15.34.31](/uploads/abaefaeba9ce8ef129522dae34574c57/2016-09-02_15.34.31.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 you do - 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 #21369 Closes #20326 See merge request !6183
| * | | | Updated spec with next click targets21369-make-it-clearer-that-diffs-can-be-collapsedLuke Bennett2016-09-031-7/+33
| | | | |
| * | | | Updated diff toggle targets and added iconLuke Bennett2016-09-035-9/+26
| | | | |
* | | | | Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' ↵Fatih Acet2016-09-307-0/+89
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Added soft wrap option to editor (attempt 2 after killing master) Previously !6188. ## What does this MR do? Adds a `Soft wrap` button to the editor, when clicked, it wraps the text in the editor and changes to `No wrap`, then when clicked, it unwraps the text in the editor. ## Are there points in the code the reviewer needs to double check? Let's make sure we dont blow up `master` this time. :fearful: :laughing: ## Why was this MR needed? ## Screenshots (if relevant) https://youtu.be/8LW5nQsraSM #### No wrap ![Screen_Shot_2016-09-02_at_19.54.54](/uploads/97f2d1b2d415d03fe1b0be0640ab12e0/Screen_Shot_2016-09-02_at_19.54.54.png) #### Soft wrap ![Screen_Shot_2016-09-02_at_19.54.45](/uploads/5af425587ce7198e015cce58440971b9/Screen_Shot_2016-09-02_at_19.54.45.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 you do - 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 #18297 See merge request !6594
| * | | | Review changes18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-appLuke Bennett2016-10-017-70/+36
| | | | | | | | | | | | | | | | | | | | Updated tests
| * | | | Added soft wrap logic and button to editorLuke Bennett2016-10-017-2/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests Added awesomeeeeee icons
| * | | | Added CHANGELOG entryLuke Bennett2016-10-011-0/+1
|/ / / /
* | | | Merge branch 'changelog-error' into 'master' Jacob Schatz2016-09-301-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix lint-doc error ## What does this MR do? Removes duplicate changelog versions to fix lint-doc error (https://gitlab.com/gitlab-org/gitlab-ce/builds/4621603) See merge request !6623
| * | | | Fix lint-doc errorAnnabel Dunstone Gray2016-09-301-3/+1
|/ / / /
* | | | Merge branch '21744-fix-missing-values-in-linter' into 'master' Rémy Coutable2016-09-305-4/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing values to linter (`only`, `except`) and add new one `Environment` Closes #21744 See merge request !6276
| * | | | Update CHANGELOGKatarzyna Kobierska2016-09-301-1/+1
| | | | |
| * | | | Update CHANGELOGKatarzyna Kobierska2016-09-301-1/+1
| | | | |
| * | | | Refactor fields in viewKatarzyna Kobierska2016-09-302-4/+4
| | | | |
| * | | | Expose jobs to viewKatarzyna Kobierska2016-09-306-33/+28
| | | | |
| * | | | Build attributes with slice methodKatarzyna Kobierska2016-09-302-15/+7
| | | | |
| * | | | Build attributes with hash, fix gitlab yaml processor testsKatarzyna Kobierska2016-09-302-11/+34
| | | | |
| * | | | Workaround for Build attributesKatarzyna Kobierska2016-09-301-0/+2
| | | | |
| * | | | Add CHANGELOGKatarzyna Kobierska2016-09-301-0/+4
| | | | |
| * | | | Improve tests grammarKatarzyna Kobierska2016-09-301-3/+5
| | | | |
| * | | | Add test for linter values visibilityKatarzyna Kobierska2016-09-302-1/+34
| | | | |
| * | | | Add missing values to linterKatarzyna Kobierska2016-09-302-1/+6
| | | | |
* | | | | Merge branch 'close-merge-request-if-open-without-source-project' into 'master' Rémy Coutable2016-09-303-5/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Before rendering `show` template we close open merge request without source project. This way there is no need to render `invalid` template. I think that it's better solution than !6383 See merge request !6478
| * | | | | Update CHANGELOGKatarzyna Kobierska2016-09-301-1/+1
| | | | | |
| * | | | | Change callbackKatarzyna Kobierska2016-09-301-1/+1
| | | | | |
| * | | | | Callback close_merge_request_without_source_projectKatarzyna Kobierska2016-09-301-7/+8
| | | | | |
| * | | | | Add CHANGELOGKatarzyna Kobierska2016-09-301-0/+1
| | | | | |
| * | | | | Improve grammarKatarzyna Kobierska2016-09-302-2/+2
| | | | | |