summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix failing specfix/import-url-issuesJames Lopez2016-04-281-5/+4
|
* added spec testing exception raisedJames Lopez2016-04-281-6/+21
|
* fix var errorJames Lopez2016-04-271-1/+1
|
* Merge branch 'issue_4271' into 'master' Jacob Schatz2016-04-269-5/+61
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to toggle whitespace changes Closes #4271 **Merge Request** <img src="/uploads/ea857269faed38a25b63b768d7f3a85b/Screen_Shot_2016-03-23_at_11.32.41_AM.png" width="1157" /> **Diff view** <img src="/uploads/bc2ac3e4855584f9214c8f3ddf325b06/Screen_Shot_2016-03-23_at_11.32.53_AM.png" width="1211" /> See merge request !3367
| * Update CHANGELOGissue_4271Alfredo Sumaran2016-04-261-1/+0
| |
| * Update CHANGELOGAlfredo Sumaran2016-04-261-0/+1
| |
| * Hide button on mobileAlfredo Sumaran2016-04-261-2/+2
| |
| * Allow to pass custom classes to buttonAlfredo Sumaran2016-04-261-6/+9
| |
| * Hide button on mobileAlfredo Sumaran2016-04-261-1/+1
| |
| * Update CHANGELOGAlfredo Sumaran2016-04-261-0/+1
| |
| * Syntax and code improvementsAlfredo Sumaran2016-04-262-14/+17
| |
| * Use variables instead of letAlfredo Sumaran2016-04-261-3/+2
| |
| * Update wordingAlfredo Sumaran2016-04-262-3/+3
| |
| * Use click_linkAlfredo Sumaran2016-04-261-1/+1
| |
| * Add documentation for "Hide whitespace changes" buttonAlfredo Sumaran2016-04-265-4/+4
| |
| * Specs for toggle Whitespaces ChangesAlfredo Sumaran2016-04-261-0/+22
| |
| * Rename methodAlfredo Sumaran2016-04-261-4/+4
| |
| * Use new method hide_whitespaces?Alfredo Sumaran2016-04-261-1/+1
| |
| * Update syntaxAlfredo Sumaran2016-04-261-2/+2
| |
| * Hide whitespace toggle button for new merge requestsAlfredo Sumaran2016-04-262-5/+7
| |
| * Add Hide/show whitespace changes button on diff and commit viewAlfredo Sumaran2016-04-262-0/+26
| |
* | Merge branch 'parallel-diff-alignment' into 'master' Jacob Schatz2016-04-261-1/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | Reduce width of parallel diffs At 50% width the alignment is off on parallel diffs (see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3785/diffs and view in Side-by-Side) Reducing width lines them up: <img src="/uploads/5775d35b0e86397abd10db6195a8a54d/Screen_Shot_2016-04-22_at_2.19.21_PM.png" width="400px"> Also shifted comment button over to center it properly: <img src="/uploads/c2468e15bb65523464a941001c3d7298/Screen_Shot_2016-04-22_at_2.24.33_PM.png" width="200px"> See merge request !3891
| * Break in middle of word if a span within parallel viewparallel-diff-alignmentAnnabel Dunstone2016-04-251-0/+5
| |
| * Reduce width of parallel diffsAnnabel Dunstone2016-04-221-1/+5
| |
* | Merge branch '15606-discussion-styling' into 'master' Jacob Schatz2016-04-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Increase screen width breakpoint for hide/show discussion Closes #15606 See merge request !3915
| * | Increase screen width breakpoint for hide/show discussion15606-discussion-stylingAnnabel Dunstone2016-04-251-1/+1
| | |
* | | Merge branch 'changelog-alternates' into 'master' Hannes Rosenögger2016-04-263-2/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow alternative names for the CHANGELOG file. "CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files. Also adds relevant tests for each of these names. Resolves #14864. See merge request !3768
| * | | Allow alternative names for the CHANGELOG file.Connor Shea2016-04-263-2/+39
|/ / / | | | | | | | | | | | | | | | | | | | | | "CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files. Also adds relevant tests for each of these names. Resolves #14864.
* | | Merge branch 'remove-devise-async' into 'master' Rémy Coutable2016-04-265-6/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove devise async The extra gem isn’t necessary anymore since Devise + Rails 4.2 has ActiveJob integration. Fixes #15575. Working towards #14286. cc: @dzaporozhets @rspeicher See merge request !3902
| * | | Remove the Devise Async gem.Connor Shea2016-04-265-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-04-261-0/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add usage example for the Office 365 GetPersonaPhoto-service. See merge request !2462
| * | | Add usage example for the Office 365 GetPersonaPhoto-service.Eirik Lygre2016-01-171-0/+13
| | | |
* | | | Merge branch 'skip-fresh-repo-fsck' into 'master' Rémy Coutable2016-04-262-6/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not fsck projects less than a day old This should bring the number of false positives down. Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423 See merge request !3926
| * | | | Do not fsck projects less than a day oldJacob Vosmaer2016-04-262-6/+13
| | | | | | | | | | | | | | | | | | | | This should bring the number of false positives down.
* | | | | Merge branch 'master' into 'master' Jacob Schatz2016-04-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed width of .search-location-badge as it was causing issues in Safari. Fixed width of .search-location-badge as it was causing issues in Safari. Fixes issue #15541 and is a minor CSS only change so [ci skip] # Before Safari: ![Screen_Shot_2016-04-24_at_22.35.38](/uploads/74388670fde3af94429d83b954833bd3/Screen_Shot_2016-04-24_at_22.35.38.png) # After Safari: ![Screen_Shot_2016-04-24_at_21.59.49](/uploads/177d0d8fda665165dff5006930604fc6/Screen_Shot_2016-04-24_at_21.59.49.png) Chrome: ![Screen_Shot_2016-04-24_at_21.59.40](/uploads/6764cd5864901210f4f8eff4388fd6db/Screen_Shot_2016-04-24_at_21.59.40.png) # CSS class referenced in the following files: `./app/assets/javascripts/search_autocomplete.js.coffee` `./app/assets/stylesheets/pages/search.scss` …and is visible on the search bar on every page. See merge request !3900
| * | | | | Fixed width of .search-location-badge as it was causing issues in Safari. #15541Jedidiah Broadbent2016-04-241-1/+1
| | | | | |
* | | | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-04-261-11/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emphasize that GitLab must be partially running when restoring backups. This caused me a lot of pain until I caught on. I also enhanced the GitLab Omnibus application data backup restore procedure. I verified the procedure by executing it with GitLab 8.6.4. See merge request !3844
| * | | | | | Emphasize that GitLab must be partially running when restoring backups. John McGehee2016-04-201-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused me a lot of pain until I caught on. I also enhanced the GitLab Omnibus application data backup restore procedure. I verified the procedure by executing it with GitLab 8.6.4.
* | | | | | | Merge branch 'search-ui-update' into 'master' Robert Speicher2016-04-2616-149/+265
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search ui update Closes #2537 See merge request !3751
| * | | | | | | Updated based on feedbacksearch-ui-updatePhil Hughes2016-04-264-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed some variable names Fixed CHANGELOG entry
| * | | | | | | Consistent border radiusPhil Hughes2016-04-263-4/+2
| | | | | | | |
| * | | | | | | Correctly shows no results textPhil Hughes2016-04-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct search results count
| * | | | | | | Fixed issue with dropdown option not stickingPhil Hughes2016-04-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG item
| * | | | | | | Fixed testsPhil Hughes2016-04-263-2/+12
| | | | | | | |
| * | | | | | | Humanize scope textPhil Hughes2016-04-262-3/+3
| | | | | | | |
| * | | | | | | Truncate issue descriptionPhil Hughes2016-04-261-1/+1
| | | | | | | |
| * | | | | | | Focus fieldPhil Hughes2016-04-261-0/+1
| | | | | | | |
| * | | | | | | Use helper methodPhil Hughes2016-04-261-8/+2
| | | | | | | |
| * | | | | | | Changes dropdown toggle on search dropdownsPhil Hughes2016-04-262-14/+22
| | | | | | | |
| * | | | | | | Removed category iconsPhil Hughes2016-04-261-66/+39
| | | | | | | |
View Lorry Controller Status