summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Return header title for new project pageremove-unnecessary-titlesDmitriy Zaporozhets2016-05-261-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove header title from project pagesDmitriy Zaporozhets2016-05-2673-78/+3
| | | | | | | With new navigation design it makes no sense to duplicate title in the header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'remove-main-language' into 'master' Josh Frye2016-05-268-83/+23
|\ | | | | | | | | | | | | Remove main_language and tests. Closes #14937 See merge request !4293
| * Update changelogJosh Frye2016-05-261-0/+1
| |
| * Remove main_language and testsremove-main-languageJosh Frye2016-05-258-84/+23
| |
* | Merge branch 'discussion-outdated-form' into 'master' Jacob Schatz2016-05-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed JS error when trying to remove discussion form ## What does this MR do? Fixes a JS error which was caused by an ID of the form not matching what was returned by the JSON. Instead of checking that, it gets the current form from the ajax success event. This would only happen on outdated discussions because the ID of the discussion form ends with `-false` because it isn't active. However, the note is added to an active discussion so the ID returned actually ends in `-true` & therefore the JS couldn't find the correct form. ## What are the relevant issue numbers? Closes #17778 See merge request !4303
| * | Fixed JS error when trying to remove discussion formPhil Hughes2016-05-261-1/+1
| | | | | | | | | | | | Closes #17778
* | | Merge branch 'link-to-in-issues-index' into 'master' Jacob Schatz2016-05-262-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `link_to_gfm` with `link_to` in merge request and issue titles. ## What does this MR do? This removed GitLab Markdown Formatting from issue titles due to issues and confusion it caused as well as performance reasons. On the issue/MR page itself, the formatting is preserved. This only effects index pages. See: ![Screen_Shot_2016-05-24_at_3.31.17_PM](/uploads/8857ed7f3cc6a47ea41ca88134e5d17a/Screen_Shot_2016-05-24_at_3.31.17_PM.png) I think the trade-off here is worth it, otherwise we'd just be playing wack-a-mole. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused a number of users, so it’s removed. This is also ever so slightly more performant :) ## What are the relevant issue numbers? This fixes #17614 and #17230. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-05-24_at_3.19.52_PM](/uploads/25313af3d3995a096b7bad7c5a26d071/Screen_Shot_2016-05-24_at_3.19.52_PM.png) After: ![Screen_Shot_2016-05-24_at_3.20.13_PM](/uploads/f14f09918001bcbac2cd939b016479b2/Screen_Shot_2016-05-24_at_3.20.13_PM.png) Before: ![Screen_Shot_2016-05-24_at_3.20.48_PM](/uploads/c183ae2c491650c328eb5768f6a55fd9/Screen_Shot_2016-05-24_at_3.20.48_PM.png) After: ![Screen_Shot_2016-05-24_at_3.20.42_PM](/uploads/d3431a691768bae2c5244b9b632061b9/Screen_Shot_2016-05-24_at_3.20.42_PM.png) cc: @rspeicher @jschatz1 See merge request !4284
| * | | Replace `link_to_gfm` with `link_to` in merge request and issue titles.link-to-in-issues-indexConnor Shea2016-05-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused some users, so it’s removed. On the issue/MR page itself, the formatting is preserved. This only effects index pages. This is also ever so slightly more performant :) This fixes #17614 and #17230.
* | | | Merge branch 'sidebar-expand-collapse' into 'master' Jacob Schatz2016-05-264-33/+117
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix right sidebar expand/collapse issue Fixed branch name of the !4117 ------------------ Fixes #15643 - Fixed a typo in `toggleSidebar` method of `Sidebar` class. - Fixed a minor styling issue to fix the sidebar to the top of the page. - Added tests for Sidebar. ## Before ![before](/uploads/c4efe9a64e0ae35f423302753caa6dfd/sFBwnVEpQB.gif) ## After ![after](/uploads/23e6b80888dae475a385912c8c40bdbd/rerKiYC4dk.gif) See merge request !4292
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵sidebar-expand-collapseFatih Acet2016-05-2669-443/+883
| |\ \ \ | |/ / / |/| | | | | | | sidebar-expand-collapse
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-2670-445/+874
|\ \ \ \
| * \ \ \ Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-2513-131/+256
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
| | * | | | Moved into class methodsupdated-contrib-calendarPhil Hughes2016-05-161-90/+105
| | | | | |
| | * | | | Updated spacing of the calendarPhil Hughes2016-05-161-0/+3
| | | | | |
| | * | | | Fixed issue with selected date not loading correctlyPhil Hughes2016-05-163-53/+49
| | | | | | | | | | | | | | | | | | | | | | | | Added loading icon to selected date box
| | * | | | Formats tooltip title & date correctlyPhil Hughes2016-05-161-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | Correctly changes the activity when clicking a date - will also revert back to old data when clicking date again
| | * | | | tests updatePhil Hughes2016-05-161-1/+1
| | | | | |
| | * | | | Removed cal heatmap from gemfilePhil Hughes2016-05-162-5/+0
| | | | | |
| | * | | | Group the contributing calendar by dayPhil Hughes2016-05-169-120/+132
| | | | | | | | | | | | | | | | | | | | | | | | This aligns the boxes correctly with the day on the left side of the calendar
| | * | | | Updated contrib map away from cal heat mapPhil Hughes2016-05-163-24/+114
| | | | | |
| * | | | | Merge branch '17339-mobile-navigation' into 'master' Jacob Schatz2016-05-259-155/+233
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobile navigation fade out Closes #17339 Closes #17610 <img src="/uploads/e382dd363bf8beb28339fa6b152be092/Screen_Shot_2016-05-18_at_10.16.59_AM.png" width="400px"> See merge request !4195
| | * | | | | Change to xs breakpoint, layout_nav updatesAnnabel Dunstone2016-05-252-11/+11
| | | | | | |
| | * | | | | Add fade out to sub navAnnabel Dunstone2016-05-256-22/+46
| | | | | | |
| | * | | | | Add fade to project nav; fix bug with controlsAnnabel Dunstone2016-05-252-103/+113
| | | | | | |
| | * | | | | Refactor nav links cssAnnabel Dunstone2016-05-251-15/+8
| | | | | | |
| | * | | | | Add fade out to left side of layout nav; remove dropdown nav helper; remove ↵Annabel Dunstone2016-05-256-44/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | controls button from mobile
| | * | | | | Fix coffeescript; remove fade out div so area is clickable; remove scrollbar ↵Annabel Dunstone2016-05-252-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | on chrome
| | * | | | | Move fade out divAnnabel Dunstone2016-05-251-2/+2
| | | | | | |
| | * | | | | Check screen width before increasing max positionAnnabel Dunstone2016-05-251-4/+2
| | | | | | |
| | * | | | | Remove arrows from mobile scroll fade outAnnabel Dunstone2016-05-256-68/+74
| | | | | | |
| | * | | | | Start scrolling tabs designAnnabel Dunstone2016-05-253-1/+50
| | | | | | |
| * | | | | | Merge branch 'upgrade-state_machines-activerecord' into 'master' Robert Speicher2016-05-252-6/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update state_machines-activerecord from 0.3.0 to 0.4.0. Includes support for Rails 5, working towards #14286. See merge request !4295
| | * | | | | Update state_machines-activerecord from 0.3.0 to 0.4.0.Connor Shea2016-05-252-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master Includes Rails 5 support.
| * | | | | | Merge branch 'add_ha_diagrams' into 'master' Achilleas Pipinellis2016-05-253-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new HA diagrams [ci skip] ## What does this MR do? Adds new HA diagrams created by @lukebabb (Thanks @lukebabb!) See merge request !4289
| | * | | | | Add new HA diagrams [ci skip]Drew Blessing2016-05-253-0/+4
| | | | | | |
| * | | | | | Merge branch 'rs-fix-rubocop' into 'master' Robert Speicher2016-05-251-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix RuboCop See merge request !4294
| | * | | | | | Fix RuboCopRobert Speicher2016-05-251-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'rs-confirmation-mail' into 'master' Robert Speicher2016-05-2513-11/+210
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New confirmation email See merge request !3354
| | * | | | | | Add CHANGELOG entry for redesigned confirmation emailsRobert Speicher2016-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | Don't remove IDs via premailerRobert Speicher2016-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to debug style rules.
| | * | | | | | New confirmation email :fire:Robert Speicher2016-05-258-2/+188
| | | | | | | |
| | * | | | | | Make the standard Devise confirmation email our new plaintext versionRobert Speicher2016-05-252-9/+9
| | | | | | | |
| | * | | | | | Customize ActionMailer preview pathRobert Speicher2016-05-252-0/+12
| |/ / / / / /
| * | | | | | Merge branch 'rs-remove-issue_to_atom' into 'master' Douwe Maan2016-05-255-28/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `issue_to_atom` helper See merge request !4265
| | * | | | | | Remove `issue_to_atom` helperrs-remove-issue_to_atomRobert Speicher2016-05-235-28/+17
| | | | | | | |
| * | | | | | | Merge branch 'improve-pipeline-design' into 'master' Douwe Maan2016-05-2512-56/+45
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve design of Pipeline view ## What does this MR do? Improves current design of Pipelines view when there is multiple stages. This makes the statuses clickable and makes the view more compact. ## Screenshots (if relevant) ![Screen_Shot_2016-05-21_at_01.20.40](/uploads/dd031b7af7005c7a61f3165fefa8b7c9/Screen_Shot_2016-05-21_at_01.20.40.png) cc @DouweM @markpundsack @rspeicher @marin See merge request !4230
| | * | | | | | | Remove top block from builds pageimprove-pipeline-designAnnabel Dunstone2016-05-243-5/+0
| | | | | | | | |
| | * | | | | | | Remove icons from tables; remove timestamp from pipelines, remove info block ↵Annabel Dunstone2016-05-247-32/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at top of pipelines
| | * | | | | | | Increase max-width of stage cellsAnnabel Dunstone2016-05-241-1/+1
| | | | | | | | |