summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Change "check out, review, and merge locally" URL to use default clone protocol.Judson Neer2016-09-061-1/+1
| | | | | Using the default protocol here (vs HTTP only) is more convenient when it comes to pasting these commands into a terminal.
* remove css selectorsubudzisz2016-09-062-11/+10
|
* improve code after reviewubudzisz2016-09-061-1/+1
|
* add feature testubudzisz2016-09-064-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-063-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch ↵12508-gitlab-ui-enhancement-proposalsFatih Acet2016-09-062-6/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-022-6/+17
| |
* | Merge branch 'repository-page-ui-issues' into 'master' Fatih Acet2016-09-066-28/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0532-184/+222
| |\ \
| * \ \ Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-0255-227/+472
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-0150-669/+724
| |\ \ \
| * | | | Fix repo page ui issues, show full last commit message in repo view.Bryce2016-08-316-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '21773-document-trigger-section-in-gitlab-ci-yml-docs' into ↵Achilleas Pipinellis2016-09-061-53/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | Clean up and refactor the triggers viewsAchilleas Pipinellis2016-09-061-53/+77
| | | | | |
| * | | | | Use stage instead of typeAchilleas Pipinellis2016-09-061-1/+1
| | | | | |
* | | | | | 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-05170-1306/+1784
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into build-cancel-spinnerPhil Hughes2016-08-30923-15735/+27821
| |\ \ \ \ \
| * | | | | | Hide build spinner on canceled buildsPhil Hughes2016-07-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19651
* | | | | | | Merge branch '21857-refactor-merge-requests-documentation' into 'master' Achilleas Pipinellis2016-09-052-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Add links to new docs in merge_requests.md and workflow/README.mdAchilleas Pipinellis2016-09-051-2/+3
| | | | | | | |
| * | | | | | | Move "Only allow merge requests to be merged if the build succeeds" to new ↵Achilleas Pipinellis2016-09-051-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | location
* | | | | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-0523-76/+91
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Scope hooks thal will run for confidential issuesDouglas Barbosa Alexandre2016-08-313-5/+6
| | | | | | | |
| * | | | | | | Add option to confidential issues events to trigger servicesDouglas Barbosa Alexandre2016-08-315-6/+9
| | | | | | | |
| * | | | | | | Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-314-1/+10
| | | | | | | |
| * | | | | | | Fix confidential issues should not be passed to WebhooksDouglas Barbosa Alexandre2016-08-311-0/+2
| | | | | | | |
| * | | | | | | Refactoring Import::BaseController#find_or_create_namespaceDouglas Barbosa Alexandre2016-08-318-47/+53
| | | | | | | |
| * | | | | | | Don't create groups for unallowed users when importing projectsDouglas Barbosa Alexandre2016-08-318-26/+20
| | | | | | | |
* | | | | | | | Merge branch 'fix-missing-flash-messages' into 'master' Rémy Coutable2016-09-051-3/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing flash messages on service edit page ## What does this MR do? This MR fixes missing post-update flash notifications for service edit page. Bug was introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/76aad9b76ed756ca9ba2cbcdb399c815e542b3ae#3ca7aff54d2814b971a98a7bf2837e07ab3dfa04_21_20 and caused by passing `notice: Successfully updated.` to path helper instead of passing it to `redirect_to` due to wrong parenthesis placement. ## Why was this MR needed? While adding HipChat integration I noticed that no messages are being displayed after clicking on "Save changes" button. I looked into code and observed that there is a code for these messages which once worked but doesn't work anymore. It's a regression which should be fixed. ## Screenshots (if relevant) ![image](/uploads/32b851e5bdc2a6438f35061473db9650/image.png) ## 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) See merge request !6195
| * | | | | | | | Fix missing flash messages on service edit pageAirat Shigapov2016-09-051-3/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'safe-ref-updates' into 'master' Douwe Maan2016-09-051-20/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safer ref updates Use `git update-ref` to prevent clobbering concurrent ref updates. If rugged/libgit2 is temporarily confused, due to concurrent `git gc` for example, then it used to be possible to accidentally reset a ref to an earlier state and lose commits. Because `git update-ref` does not get confused by `git gc`, what will happen now is that the commit based on confused information fails, preventing data loss. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20353 See merge request !6130
| * | | | | | | Make error message appropriate for end usersJacob Vosmaer2016-09-021-2/+2
| | | | | | | |
| * | | | | | | Use 'git update-ref' for safer web commitsJacob Vosmaer2016-09-021-20/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-suggested-colors-underline' into 'master' Annabel Dunstone Gray2016-09-021-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove suggested colors hover underline ## What does this MR do? * Removes the blue hover underline for the suggested color containers * Added `cursor: pointer` to the suggested color containers ## Are there points in the code the reviewer needs to double check? Shouldn't be :smile: ## Why was this MR needed? Improves UI ## Screenshots (if relevant) Before: ![DS48AvgSVX](/uploads/0077e7a5837c8ce9fe2493ad6a42a018/DS48AvgSVX.gif) After: ![olZzS68WNr](/uploads/4e0ae808c69942a528f1303df8cddeae/olZzS68WNr.gif) ## 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 #21792 See merge request !6165
| * | | | | | | Remove suggested colors hover underlineClement Ho2016-09-021-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'icon-button-alignment' into 'master' Fatih Acet2016-09-023-5/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of icon buttons ## What does this MR do? Fix misalignment of buttons with only an icon which was introduced by !5451. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5451#note_14066627 ## Screenshots ### Before ![with-text](/uploads/aa7f7a98e2015070689e762e0cf99844/witht-text.png) ![without-text](/uploads/72db7c54e3961fd0df34b0ea79455fd0/without-text.png) ### After ![with-text](/uploads/3f19e55773083bcb22f3909f6dc0d147/witht-text.png) ![without-text](/uploads/b6647d4d71eb5cd9d1712908d2b93665/without-text.png) See merge request !5887
| * | | | | | | | Fix alignment of icon buttons (!5887)winniehell2016-08-193-5/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-wiki-anchor-interaction' into 'master' Fatih Acet2016-09-023-17/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown anchor icon interaction ## What does this MR do? Fixes and improves the markdown anchor icon interaction so that hovering over any headers (generated through markdown) will have an anchor icon that's easily accessible (won't hide from you on edge cases), replaced the icon with fontAwesome icon and added more padding for the anchor icon. ## Are there points in the code the reviewer needs to double check? 1. Need to check if it's okay to replace the icon-link.png with fontAwesome 2. Need to check if it's okay for the additional view padding on views that render markdown to compensate for anchor link space 3. Need to check if there are any other views that render markdown that did not have it's padding re-adjusted ## Why was this MR needed? Improve markdown rendered anchor links so that they are more user friendly ## What are the relevant issue numbers? Closes #20459 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-07-30_at_2.31.43_PM](/uploads/12b2aad7f130d26a709ff28083ecc2e3/Screen_Shot_2016-07-30_at_2.31.43_PM.png) After: ![Screen_Shot_2016-08-08_at_10.25.06_AM](/uploads/caac1985cfbd305b8c8665d86e30ab24/Screen_Shot_2016-08-08_at_10.25.06_AM.png) Before: ![https://gitlab.com/gitlab-org/gitlab-ce/uploads/45e6d0aee7abbdb42a4c781ae0ba1961/ws7MBrK70g.gif](https://gitlab.com/gitlab-org/gitlab-ce/uploads/45e6d0aee7abbdb42a4c781ae0ba1961/ws7MBrK70g.gif) After: ![nLQOMn9RUO](/uploads/3905ceac2d591399d14cec1b3319f46b/nLQOMn9RUO.gif) ## 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 [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 !5577
| * | | | | | | | | Fix markdown anchor icon interactionClement Ho2016-09-023-17/+11
| | | | | | | | | |
* | | | | | | | | | Merge branch '21471-bold-text-in-ci-build-output-not-styled' into 'master' Annabel Dunstone Gray2016-09-021-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `.term-bold` declaration. ## What does this MR do? Added `.term-bold` declaration. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/21471#note_14874299 ## Screenshots (if relevant) ## 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 #21471 See merge request !6171
| * | | | | | | | | | Added `.term-bold` declaration.21471-bold-text-in-ci-build-output-not-styledLuke "Jared" Bennett2016-09-021-0/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-add-button-alignment' into 'master' Fatih Acet2016-09-021-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align add button on repository view ## What does this MR do? Top aligns the add button to the other UI elements adjacent to it :smile: ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Fixes a UI inconsistency ## What are the relevant issue numbers? Closes #21168 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-24_at_3.53.00_PM__2_](/uploads/5d6d765bb8a1d640170805ec32956790/Screen_Shot_2016-08-24_at_3.53.00_PM__2_.png) After: ![Screen_Shot_2016-08-24_at_3.52.44_PM__2_](/uploads/1db9f0f68ef5defa4dd111d7dae1dc26/Screen_Shot_2016-08-24_at_3.52.44_PM__2_.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] 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 !5971
| * | | | | | | | | | Align add button on repository viewClement Ho2016-09-011-0/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'project-edit-features-hide' into 'master' Fatih Acet2016-09-023-18/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides merge request section in edit project when disabled ## What does this MR do? Correctly hides the merge request section in the project edit page when disabled. It used to work before the feature visibility part was changed to dropdown - so added a test to prevent in future! :thumbsup: ## Screenshots (if relevant) ![hide](/uploads/eb72ef87bad19c2716472a0c1031fd32/hide.gif) See merge request !6175
| * | | | | | | | | | Refactored code to rely less on IDs that could changeproject-edit-features-hidePhil Hughes2016-09-022-6/+14
| | | | | | | | | | |
| * | | | | | | | | | Hides merge request section in edit project when disabledPhil Hughes2016-09-022-15/+18
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'commit-message-scroll' into 'master' Fatih Acet2016-09-0210-83/+84
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit message blocks #### What does this MR do? * Wraps code commit message blocks * Consolidates similar shades of gray (cc @cperessini @tauriedavis) Related to #20831 #### Screenshots (if relevant) Before: ![Screen_Shot_2016-08-19_at_10.41.07_AM](/uploads/4529d178123e18b0aad35a252061902b/Screen_Shot_2016-08-19_at_10.41.07_AM.png) After: ![Screen_Shot_2016-08-19_at_10.40.42_AM](/uploads/499818f360e7c3cd9d31bc335cae1a82/Screen_Shot_2016-08-19_at_10.40.42_AM.png) See merge request !5906