summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reordered dropdown options18849-project-snippets-page-isn-t-really-responsiveLuke Bennett2016-09-0716-92/+75
| | | | | | | | | | | | | | | | | | | | | | | | Rearranged datetime created line Added `avatar_class` option to `link_to_member` so it can be hidden Made snippet title font heavier Added file title bar Hidden unneeded info from xs screens Added visibility icon Reveal file-actions on xs screens Added comments icon to snippets list items Refactored no-comments declaration into framework stylesheet Final touch ups Fixed snippets_spec
* Merge branch '20321-handle-long-variable-values-better' into 'master' Rémy Coutable2016-09-066-11/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle variable values ## What does this MR do? User can display variables on click. Variables will hide after page is refresh. ## What are the relevant issue numbers? Closes #20321 ## Screenshots (if relevant) ![Zrzut_ekranu_z_2016-08-23_16_32_29](/uploads/649576b5c77fc4636924de00ddb0f190/Zrzut_ekranu_z_2016-08-23_16_32_29.png) ![Zrzut_ekranu_z_2016-09-01_17_59_40](/uploads/7e96210b9c8354f0b406b9df8018a94c/Zrzut_ekranu_z_2016-09-01_17_59_40.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 - [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) cc: @kradydal @grzesiek @yorickpeterse [@chastell](https://github.com/chastell) @tmaczukin See merge request !5628
| * remove css selectorsubudzisz2016-09-062-11/+10
| |
| * improve code after reviewubudzisz2016-09-062-2/+2
| |
| * add feature testubudzisz2016-09-067-31/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add feature test add feature test add feature test remove test to builds_spec remove feature test to builds_spec remove feature test to builds_spec add changes to methods and remove FactoryGirl add changes to methods and remove FactoryGirl adding changes to test and js file changes grammar update changelog rename file name update files after review update files after review update files after review
| * add js fileubudzisz2016-09-065-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show variables on-click show variables on-click show variables on-click remove = and add new js classes into sidebar.scss show variables by clicking button show variables by clicking button show variables by clicking button show variables by clicking button use id for a class add nicescroll add nicescroll
| * render only commit titleubudzisz2016-09-061-0/+4
|/ | | | update CHANGELOG
* Merge branch ↵12508-gitlab-ui-enhancement-proposalsFatih Acet2016-09-064-6/+51
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19814-regression-snippet-pagination-on-user-page-leads-to-raw-json-instead-of-normal-webpage' into 'master' Fix pagination on user snippets page ## What does this MR do? Copy the pagination code from projects -> snippets on a user's profile page. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? It was a bug! ## Screenshots (if relevant) (I set the pagination to two per page for this, because I'm lazy.) ![Snippets](/uploads/986abd8608cda1cd76416e55b2c3a3ba/Snippets.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [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 #19814. See merge request !6179
| * Convert SnippetsList to ES619814-regression-snippet-pagination-on-user-page-leads-to-raw-json-instead-of-normal-webpageSean McGivern2016-09-052-7/+11
| |
| * Fix pagination on user snippets pageSean McGivern2016-09-024-6/+47
| |
* | Merge branch 'repository-page-ui-issues' into 'master' Fatih Acet2016-09-067-28/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix repository page ui issues ## What does this MR do? Fixes 3 UI issues outlined in https://gitlab.com/gitlab-org/gitlab-ce/issues/19610. ## Are there points in the code the reviewer needs to double check? Not afaik. ## Why was this MR needed? To fix problems with the UI noted in relevant issues. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19610 (combines all three) also Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19614, Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19615, Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19616 Integrates changes from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5530/diffs?view=parallel ## Screenshots (if relevant) Right align & color contrast issues (https://gitlab.com/gitlab-org/gitlab-ce/issues/19614 & https://gitlab.com/gitlab-org/gitlab-ce/issues/19616) Before: ![no-contrast](/uploads/9dec2510250806434cf686d6362eda4d/Screen_Shot_2016-07-07_at_1.46.08_PM.png) ![left-align](/uploads/09ddc525491010538d7bce95c410a067/Screen_Shot_2016-07-07_at_1.42.17_PM.png) After: ![right-align-and-contrast](/uploads/0d303179150ce718a28cd38ddbbf2954/right-align-and-contrast.png) Truncate last commit (https://gitlab.com/gitlab-org/gitlab-ce/issues/19615) Before: ![not-truncated](/uploads/e66213db28d11cc44e7eb8578ac788fd/Screen_Shot_2016-07-07_at_1.40.26_PM.png) After: ![truncated-commit-message](/uploads/94947234451f29c34df3c2bd8846193d/truncated-commit-message.png) **UPDATED screenshot![Screen_Shot_2016-09-02_at_2.15.04_PM](/uploads/dc11e6159759818b5ea69e04206c5691/Screen_Shot_2016-09-02_at_2.15.04_PM.png)** ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [X] All builds are passing - [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) See merge request !5308
| * \ Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-0520-157/+179
| |\ \
| * \ \ Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-0544-269/+528
| |\ \ \
| * \ \ \ Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-02124-403/+1234
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-0194-1002/+1574
| |\ \ \ \
| * | | | | Fix repo page ui issues, show full last commit message in repo view.Bryce2016-08-317-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrates changes from ClemMakesApps' commit: 8581e152, although it was reverted to avoid frustrating conflicts. See MR: !5530 (diffs)
| * | | | | Revert "Add last commit time to repo view"Bryce2016-08-312-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8581e152ef8fa27b6670760d39b7f06dab5f796b. This creates really difficult conflicts with another MR that was worked on simulataneously. That MR mostly encompassed the aims of this commit. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5308/commits
* | | | | | Merge branch 'zj-test-migration-paths' into 'master' Kamil Trzciński2016-09-062-1/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test migration paths ## What does this MR do? It checks out the code base at v8.0.5, seeds the database, and runs all migrations. ## Are there points in the code the reviewer needs to double check? If this might make sense, does this simulate enough what happens in the real world. ## What are the relevant issue numbers? Closes #14549 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4874
| * | | | | | Have CI test migration pathsZ.J. van de Weg2016-09-062-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a job to the pipeline to test if migration on seed data works. Even though the seed data is not perfect, it does give more guarentees that this will succeed in the real world too. seed_fu is used instead of dev:setup to save some time, as they both generate the data in the same way, this should be fine.
* | | | | | | Merge branch '21773-document-trigger-section-in-gitlab-ci-yml-docs' into ↵Achilleas Pipinellis2016-09-068-99/+89
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Better document triggers docs ## What does this MR do? - Refactor the triggers page view - Replace old images with new ones - Mention triggers in `ci/yaml/README.md` ## Screenshots (if relevant) The new triggers views contains more information and is prettier :) ## Before ![screenshot-localhost_3000_2016-09-06_10-53-10](/uploads/8f45a0e21a31f1819af1739f7af8afd0/screenshot-localhost_3000_2016-09-06_10-53-10.png) # After ![screenshot-localhost_3000_2016-09-06_10-36-34](/uploads/2bbe2801b0f959851a8cfa5a8a14623d/screenshot-localhost_3000_2016-09-06_10-36-34.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [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 #21773 See merge request !6217
| * | | | | | | Fix failing rspec test for triggersAchilleas Pipinellis2016-09-061-1/+1
| | | | | | | |
| * | | | | | | Add Changelog entry21773-document-trigger-section-in-gitlab-ci-yml-docsAchilleas Pipinellis2016-09-061-0/+1
| | | | | | | |
| * | | | | | | Add a reference to triggers docs in ci/yaml/README.mdAchilleas Pipinellis2016-09-061-0/+7
| | | | | | | |
| * | | | | | | Replace the triggers docs with new imagesAchilleas Pipinellis2016-09-065-1/+3
| | | | | | | |
| * | | | | | | Clean up and refactor the triggers viewsAchilleas Pipinellis2016-09-061-53/+77
| | | | | | | |
| * | | | | | | Use stage instead of typeAchilleas Pipinellis2016-09-061-1/+1
| | | | | | | |
| * | | | | | | Remove doctocAchilleas Pipinellis2016-09-061-44/+0
| | | | | | | |
* | | | | | | | Merge branch 'clean_up_search_classes' into 'master' Rémy Coutable2016-09-065-42/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up search result classes ## What does this MR do? Clean up search result classes ## Are there points in the code the reviewer needs to double check? I checked if those methods are used and it seems like NO. But you can check as well. ## Why was this MR needed? To be clean See merge request !6216
| * | | | | | | Clean up search result classesclean_up_search_classesValery Sizov2016-09-065-42/+0
| |/ / / / / /
* | | | | | | Merge branch 'build-cancel-spinner' into 'master' Fatih Acet2016-09-061-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide build spinner on canceled builds ## What does this MR do? If the build has canceled this correctly hides the spinner ## What are the relevant issue numbers? Closes #19651 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_13.51.57](/uploads/8342470cf35dae7c67168d9153592fb6/Screen_Shot_2016-07-11_at_13.51.57.png) See merge request !5182
| * | | | | | Merge branch 'master' into build-cancel-spinnerbuild-cancel-spinnerPhil Hughes2016-09-05338-2265/+5598
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into build-cancel-spinnerPhil Hughes2016-08-302113-38477/+92898
| |\ \ \ \ \ \ \
| * | | | | | | | Hide build spinner on canceled buildsPhil Hughes2016-07-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19651
* | | | | | | | | Merge branch 'zj-drop-gitorious-field' into 'master' Rubén Dávila Santos2016-09-052-0/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitorious from import_sources on ApplicationSetting model Removes 'gitorious' as import field from the import_sources field on ApplicationSetting Closes #21804 cc @markglenfletcher See merge request !6180
| * | | | | | | | | Don't fail on an empty databasezj-drop-gitorious-fieldZ.J. van de Weg2016-09-052-6/+11
| | | | | | | | | |
| * | | | | | | | | Support MySQL too, when removing gitorious from import_sourcesZ.J. van de Weg2016-09-051-1/+5
| | | | | | | | | |
| * | | | | | | | | Remove gitorious from import_sources on ApplicationSetting modelZ.J. van de Weg2016-09-053-1/+33
| | | | | | | | | |
* | | | | | | | | | Merge branch '21857-refactor-merge-requests-documentation' into 'master' Achilleas Pipinellis2016-09-0538-286/+445
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor merge requests documentation ## What does this MR do? Add more information on merge requests. ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [x] Make sure internal links pointing to the document in question are not broken. - [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [x] If working on CE, submit an MR to EE with the changes as well. --- Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21857 See merge request !6202
| * | | | | | | | | Refactor authorization_for_merge_requests.md21857-refactor-merge-requests-documentationAchilleas Pipinellis2016-09-051-16/+32
| | | | | | | | | |
| * | | | | | | | | Add links to new docs in merge_requests.md and workflow/README.mdAchilleas Pipinellis2016-09-055-34/+128
| | | | | | | | | |
| * | | | | | | | | Move merge request versions to its own documentAchilleas Pipinellis2016-09-053-5/+23
| | | | | | | | | |
| * | | | | | | | | Move "Only allow merge requests to be merged if the build succeeds" to new ↵Achilleas Pipinellis2016-09-055-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location
| * | | | | | | | | Move revert_changes.md to new locationAchilleas Pipinellis2016-09-057-65/+66
| | | | | | | | | |
| * | | | | | | | | Move cherry_pick_changes.md to new locationAchilleas Pipinellis2016-09-057-53/+54
| | | | | | | | | |
| * | | | | | | | | Move `wip_merge_requests.md` to a new locationAchilleas Pipinellis2016-09-056-14/+19
| | | | | | | | | |
| * | | | | | | | | Move merge_when_build_succeeds.md to new locationAchilleas Pipinellis2016-09-054-15/+29
| | | | | | | | | |
| * | | | | | | | | Move authorization_for_merge_requests.md to new locationAchilleas Pipinellis2016-09-052-40/+41
| | | | | | | | | |
| * | | | | | | | | Move `workflow/merge_requests.md` to `user/project/merge_requests.md`Achilleas Pipinellis2016-09-058-91/+92
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-changelog' into 'master' Rémy Coutable2016-09-051-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12 ## What does this MR do? Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12 ## Why was this MR needed? They were wrongly added to 8.11 here: - https://gitlab.com/gitlab-org/gitlab-ce/commit/220755f52ad6e3fdfa43c62e0a4a4051721246dc#note_14900001 - https://gitlab.com/gitlab-org/gitlab-ce/commit/87f93ceb9542c415d6c23c72ff93d63272107d54 See merge request !6189
| * | | | | | | | | Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12fix-changelogWinnie2016-09-021-3/+3
| | | | | | | | | |