summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'project-group-ui' into 'master' Jacob Schatz2016-04-289-62/+89
|\ | | | | | | | | | | | | | | | | Project group UI Closes #13991 ![Screen_Shot_2016-04-25_at_14.54.49](/uploads/e55fd1731a479d93660a1ff8359f56d6/Screen_Shot_2016-04-25_at_14.54.49.png) See merge request !3911
| * Changed settings icon color variableproject-group-uiPhil Hughes2016-04-272-2/+1
| |
| * Fixed failing testsPhil Hughes2016-04-251-4/+2
| |
| * Updated select box to match designPhil Hughes2016-04-252-1/+21
| |
| * Updated project group sharing UIPhil Hughes2016-04-258-62/+72
| | | | | | | | Closes #13991
* | Merge branch 'navigation-redesign' into 'master' Dmitriy Zaporozhets2016-04-283-7/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Grey header and fluid profile navigation Based on https://gitlab.com/gitlab-org/gitlab-ce/issues/14838#note_5083863 cc @skyruler See merge request !3968
| * | Reuse more popular colorsDmitriy Zaporozhets2016-04-282-4/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make layout navigation gray and fluidnavigation-redesignDmitriy Zaporozhets2016-04-282-4/+23
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make application header light grayDmitriy Zaporozhets2016-04-281-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix/ci-skipped-status' into 'master' Rémy Coutable2016-04-281-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Build status `canceled` if any of the jobs canceled Before this change in case of any of the jobs had been canceled, build status was `failed`. Closes #14207 See merge request !3778
| * | Render canceled status if any of the jobs canceledGrzegorz Bizon2016-04-271-1/+1
| | | | | | | | | | | | | | | This status will be returned only when there are no failed jobs that are not allowed to fail.
* | | Merge branch 'add-js-prefix-to-user-tab-classes' into 'master' Jacob Schatz2016-04-272-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JS prefix to user tab classes ## What does this MR do This MR adds the `js-` prefix to the classes which are used for js purposes only. This MR only affects the said classes inside `users/show.html.haml`. ## Are there points in the code the reviewer needs to double check? I'm not entirely sure if this project uses the `js-` prefix for classes that are used for js purposes only. Doing a grep shows some of the classes have the prefix, but I'm still unsure whether this project follows this rule. ## Why was this MR needed? As I was working thru #13401, I wanted to add a tab on the user profile page to show the contributions outside the GitLab instance. Reading the JS, I came across this. This MR helps new people reading the code that the said classes are for js purposes only. Also, it helps the project work toward to uniform class naming. I suggest that we document adding the `js-` prefix to classes for js purposes only (if this is the case for this project) See merge request !3928
| * | | Add JS prefix to user tab classesKarlo Soriano2016-04-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | I'm not entirely sure if this project uses the `js-` prefix for classes that are for js purposes only. But as I was working on a feature, I noticed that these classes were those kind of classes.
* | | | Merge branch 'sidebar-label-link' into 'master' Jacob Schatz2016-04-272-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated label links to work correctly for filtering See !3846#note_5033951 See merge request !3920
| * | | | Updated label links to work correctly for filteringsidebar-label-linkPhil Hughes2016-04-262-2/+2
| | | | | | | | | | | | | | | | | | | | See !3846#note_5033951
* | | | | Merge branch 'esc-close-dropdown' into 'master' Jacob Schatz2016-04-271-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape key closes the dropdown Fixes #15432 ![esc](/uploads/067e32bcaf265c3241d84dcbd3f11532/esc.gif) See merge request !3904
| * | | | Escape key closes the dropdownesc-close-dropdownPhil Hughes2016-04-261-0/+3
| | | | | | | | | | | | | | | | | | | | Fixes #15432
* | | | | Merge branch 'issue_4271' into 'master' Jacob Schatz2016-04-263-2/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | 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
| | | | | |
| * | | | | Syntax and code improvementsAlfredo Sumaran2016-04-261-11/+13
| | | | | |
| * | | | | 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
| | | | | | |
* | | | | | | Allow alternative names for the CHANGELOG file.Connor Shea2016-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files. Also adds relevant tests for each of these names. Resolves #14864.
* | | | | | | Remove the Devise Async gem.Connor Shea2016-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* | | | | | | Merge branch 'skip-fresh-repo-fsck' into 'master' Rémy Coutable2016-04-261-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-2/+2
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 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 'search-ui-update' into 'master' Robert Speicher2016-04-2613-149/+258
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search ui update Closes #2537 See merge request !3751
| * | | | | | Updated based on feedbacksearch-ui-updatePhil Hughes2016-04-263-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG item
| * | | | | | Fixed testsPhil Hughes2016-04-261-2/+6
| | | | | | |
| * | | | | | 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
| | | | | | |