summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updates from last code review.issue_13621_2Rubén Dávila2016-03-0636-496/+317
|
* Add link with filter by milestone for labels and avatar.Rubén Dávila2016-03-041-2/+8
| | | | Closes #13628
* Add some spinach specs.Rubén Dávila2016-03-042-2/+71
|
* Add missing partials!Rubén Dávila2016-03-042-0/+31
|
* Show some stats about Milestone according to the new UI.Rubén Dávila2016-03-042-10/+26
|
* Show Project name on Labels tab for Group and Dashboard context.Rubén Dávila2016-03-041-1/+8
|
* Use the same partial when rendering Issues or Merge Requests.Rubén Dávila2016-03-047-59/+10
|
* Make Merge Requests tab have the same look as Issues.Rubén Dávila2016-03-048-50/+26
|
* Show project name for Issues tab in Group and Dashboard context.Rubén Dávila2016-03-045-10/+17
|
* Refactor Milestone view for Dashboard.Rubén Dávila2016-03-045-70/+10
|
* Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-046-15/+48
| | | | | * Add Labels tab to Groups * Add decorator for label so it's aware of Milestones.
* Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-043-21/+10
|
* Eager load Issues/MRs project for Milestone.Rubén Dávila2016-03-044-4/+7
| | | | | With this change we avoid doing N+1 queries when viewing Milestone's Issues/MRs from a Group context.
* Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-045-29/+20
|
* Recator Issues Tab into a custom partial.Rubén Dávila2016-03-045-24/+14
|
* Refactor GlobalMilestone queries.Rubén Dávila2016-03-048-18/+19
| | | | Make methods return ActiveRecord Relations instead of Arrays.
* Merge branch 'fix/sentry-1182' into 'master' Douwe Maan2016-03-041-6/+2
|\ | | | | | | | | | | | | | | | | | | In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today For some reason, GoogleBot accesses `/u/:username/calendar_activities` without a `:date` param, but then the view was trying to call `#to_s(:short)` which doesn't exist on `nil`, leading to the following Sentry report: https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/ See merge request !3074
| * In UsersController#calendar_activities, when Date isn't parsable, fallback ↵fix/sentry-1182Rémy Coutable2016-03-031-6/+2
| | | | | | | | | | | | | | | | | | to Date.today For some reason, GoogleBot accesses /u/:username/calendar_activities without a :date param, but then the view was trying to call #to_s(:short) which doesn't exist on nil, leading to the following Sentry report: https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/
* | Merge branch 'ctr-enter-textarea-mac' into 'master' Jacob Schatz2016-03-041-4/+1
|\ \ | | | | | | | | | | | | | | | | | | ctrl+enter on mac correctly submits forms Closes #4177 See merge request !3089
| * | ctrl+enter on mac correctly submits formsctr-enter-textarea-macPhil Hughes2016-03-041-4/+1
| | | | | | | | | | | | Closes #4177
* | | Merge branch 'dropdown-design-update' into 'master' Jacob Schatz2016-03-047-48/+117
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated dropdown CSS This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field ![Screen_Shot_2016-03-04_at_12.23.49](/uploads/6f2047ec1b72974334fa56e6895a32be/Screen_Shot_2016-03-04_at_12.23.49.png) See merge request !3092
| * | | Dropdown caret color in variabledropdown-design-updatePhil Hughes2016-03-042-1/+2
| | | |
| * | | Updated CSS so .open doesnt have to be on a dropdown elementPhil Hughes2016-03-042-8/+7
| | | |
| * | | Updated dropdown CSSPhil Hughes2016-03-047-44/+113
| |/ / | | | | | | | | | This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field
* | | Remove "(unreleased)" from 8.5.4 changelogRémy Coutable2016-03-041-1/+1
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'dashboard-search-field-tabindex' into 'master' Jacob Schatz2016-03-042-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tabindex to filter field Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much. Closes #3706 See merge request !3093
| * | | Added tabindex to filter fielddashboard-search-field-tabindexPhil Hughes2016-03-042-2/+2
| | | | | | | | | | | | | | | | | | | | Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much Closes #3706
* | | | Merge remote-tracking branch 'origin/issue_5854'Dmitriy Zaporozhets2016-03-043-4/+7
|\ \ \ \
| * | | | update CHANGELOG.issue_5854Rubén Dávila2016-03-031-0/+1
| | | | |
| * | | | Add commit message to JIRA's notification payload.Rubén Dávila2016-03-032-4/+6
| | | | |
* | | | | Merge remote-tracking branch 'origin/sort-starred-projects'Dmitriy Zaporozhets2016-03-042-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Revert "Sort starred projects on dashboard based on last activity by ↵sort-starred-projectsDmitriy Zaporozhets2016-03-032-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default"" This reverts commit 617bb1096deb1fb5dea66d04b9bbd7da0dfb57ba.
* | | | | Merge branch 'fix/invalidate-builds-badge-cache' into 'master' Rémy Coutable2016-03-044-0/+25
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invalidate cache for builds badge This fixes cache issue with badges (we should not cache badge images). Closes #13982 See merge request !3086
| * | | | Add Changelog entry for badges cache fixfix/invalidate-builds-badge-cacheGrzegorz Bizon2016-03-041-0/+3
| | | | |
| * | | | Invalidate cache for builds badgeGrzegorz Bizon2016-03-043-0/+22
|/ / / / | | | | | | | | | | | | Closes #13982
* | | | Merge branch 'issue_13300' into 'master' Jacob Schatz2016-03-042-2/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the notes polling timeout over time Originally by @roperzh at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2821 Fixes #13300 See merge request !3071
| * | | | Use camelCase for variable namesissue_13300Alfredo Sumaran2016-03-031-9/+9
| | | | |
| * | | | Update CHANGELOGAlfredo Sumaran2016-03-031-0/+1
| | | | |
| * | | | Set @max_polling_steps to 4 so the last interval will be 120 secondsAlfredo Sumaran2016-03-031-1/+1
| | | | |
| * | | | Provide @max_polling_steps instead of @limit_polling_intervalAlfredo Sumaran2016-03-031-2/+3
| | | | |
| * | | | Prevent multiple refreshes if a refresh is happeningAlfredo Sumaran2016-03-031-0/+4
| | | | |
| * | | | Increase the notes polling timeout over timeRoberto Dip2016-03-031-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A file called notes is loaded every ~15 seconds which checks for updates to content on the page. This commit increases the polling timeout over time (15, 30, 60, 120 seconds) and resets it to 15 seconds if the AJAX call returns new notes Fixes issue #13300
* | | | | Merge branch 'ssh-key-settings' into 'master' Robert Speicher2016-03-0418-78/+112
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSH keys settings Closes #13860 See merge request !3034
| * | | | | Improve consistency of SSH Keys title in administration areassh-key-settingsRobert Speicher2016-03-031-1/+1
| | | | | |
| * | | | | Restructure SSH key table partial renderingRobert Speicher2016-03-032-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, we were double-checking `@keys.any?`, and unnecessarily assigning `is_admin` in a view where it wasn't needed.
| * | | | | Don't abuse the flash store for displaying SSH Key form errorsRobert Speicher2016-03-031-2/+3
| | | | | |
| * | | | | Remove `Profile::KeysController#new` actionRobert Speicher2016-03-035-17/+2
| | | | | |
| * | | | | Move SSH key JS to Profile CS classRobert Speicher2016-03-032-11/+9
| | | | | |
| * | | | | SSH key ellipsis on mobilePhil Hughes2016-03-032-2/+16
| | | | | |
| * | | | | Changed link colourPhil Hughes2016-03-031-1/+1
| | | | | |
View Lorry Controller Status