summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with spacing in issuable headerissuable-header-by-spacingPhil Hughes2016-05-271-1/+1
| | | | | | The Ruby was returning the HTML without a spacing next to the word 'by' Closes #17864
* Merge branch 'fix-shortcuts-spec' into 'master' Jacob Schatz2016-05-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Ensure project name is present on page ## What does this MR do? Fixes a failing spec See merge request !4307
| * Ensure project name is present on pagefix-shortcuts-specAlfredo Sumaran2016-05-261-2/+2
| |
* | Merge branch 'filter-by-any-user' into 'master' Jacob Schatz2016-05-264-12/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Filter issuables by any user ![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif) Closes #2836 See merge request !3820
| * | Fixed user select failing tests on merge requestfilter-by-any-userPhil Hughes2016-05-261-1/+1
| | |
| * | Filter issuables by any userPhil Hughes2016-05-264-12/+46
| | | | | | | | | | | | Closes #2836
* | | Merge branch 'rs-remove-pending-spec' into 'master' Robert Speicher2016-05-261-5/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove boilerplate spec file for Ci::RunnerProject See merge request !4309
| * | | Remove boilerplate spec file for Ci::RunnerProjectRobert Speicher2016-05-261-5/+0
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'fix/gitlab-importer-issue' into 'master' Robert Speicher2016-05-262-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab importer issue Fixed credentials not being called correctly - probably some bad refactoring or search & replace... Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4301
| * | | | added changelogfix/gitlab-importer-issueJames Lopez2016-05-261-0/+3
| | | | |
| * | | | fix bad refactoring of import data credentialsJames Lopez2016-05-261-3/+3
| | |/ / | |/| |
* | | | Merge branch 'scroll-links-bug' into 'master' Jacob Schatz2016-05-261-0/+21
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where fade div covers up controls button ## What does this MR do? Fixes bug where fade div covers up controls button ## Screenshots (if relevant) Before: <img src="/uploads/a6a883839255b8e10d872759a1aa54a0/Screen_Shot_2016-05-26_at_2.22.08_PM.png" width="300px"> After: <img src="/uploads/9ab53d9815470cf86f68f5a340ffc454/Screen_Shot_2016-05-26_at_2.22.42_PM.png" width="300px"> See merge request !4306
| * | | Fix bug where fade div covers up controls buttonscroll-links-bugAnnabel Dunstone2016-05-261-0/+21
| | | |
* | | | Merge branch 'remove-unnecessary-titles' into 'master' Robert Speicher2016-05-2673-78/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Remove header title from project pages With new navigation design it makes no sense to duplicate title in the header. See merge request !4304
| * | | 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 'commit-header-buttons' into 'master' Jacob Schatz2016-05-264-38/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced number of buttons in commit header ## What does this MR do? Reduces the buttons in the commit header. ## What are the relevant issue numbers? Closes #17576 ## Screenshots ![Screen_Shot_2016-05-26_at_11.22.24](/uploads/b0d8535bbc02ae367f193dd6633bd022/Screen_Shot_2016-05-26_at_11.22.24.png) See merge request !4302
| * | | | Improved mobile stylingcommit-header-buttonsPhil Hughes2016-05-262-14/+37
| | | | |
| * | | | Reduced number of buttons in commit headerPhil Hughes2016-05-264-26/+28
| | |/ / | |/| | | | | | | | | | Closes #17576
* | | | Merge branch 'move-project-dropdown-async' into 'master' Jacob Schatz2016-05-265-9/+47
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loads move issue dropdown async To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns. ![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif) Closes #16563 See merge request !4160
| * | | Updated Rubymove-project-dropdown-asyncPhil Hughes2016-05-251-2/+5
| | | |
| * | | Correctly sends project IDPhil Hughes2016-05-203-3/+3
| | | |
| * | | Fixed rubocop errorPhil Hughes2016-05-161-1/+0
| | | |
| * | | Updated testsPhil Hughes2016-05-161-5/+10
| | | |
| * | | Loads move issue dropdown asyncPhil Hughes2016-05-164-3/+34
| | | | | | | | | | | | | | | | Closes #16563
* | | | Merge branch 'measure-proxy-timing' into 'master' Yorick Peterse2016-05-263-0/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Measure proxy flight time See merge request !4278
| * | | | Rename metric to 'rails queue duration'Jacob Vosmaer2016-05-263-5/+5
| | | | |
| * | | | Test ProxyFlightTime middlewareJacob Vosmaer2016-05-251-0/+31
| | | | |
| * | | | Align class name with field nameJacob Vosmaer2016-05-252-2/+2
| | | | |
| * | | | Send data to InfluxDB instead of stdoutJacob Vosmaer2016-05-251-4/+6
| | | | |
| * | | | Couple ProxyTiming to Metrics middlewareJacob Vosmaer2016-05-252-1/+1
| | | | |
| * | | | Measure proxy timing: needs influxdb codeJacob Vosmaer2016-05-242-0/+23
| | | | |
* | | | | Merge branch 'services-ui' into 'master' Jacob Schatz2016-05-262-39/+45
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Updated services UI ![Screen_Shot_2016-05-17_at_10.38.10](/uploads/791ba27b3bbc18c9bde19ecf58ffea21/Screen_Shot_2016-05-17_at_10.38.10.png) See merge request !4177
| * | | | Hide description on mobileservices-uiPhil Hughes2016-05-261-25/+24
| | | | |
| * | | | Updated services UIPhil Hughes2016-05-172-39/+46
| | | | |
* | | | | 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