summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' Yorick Peterse2017-01-201-1/+6
| | | | | | | | | | | | | | Record used SSH keys only once per day Closes #26877 See merge request !8655
* | Merge branch '21698-redis-runner-last-build' into 'master' Kamil Trzciński2017-01-204-0/+58
| | | | | | | | | | Reduce DB-load for build-queues by storing last_update in Redis See merge request !8084
* | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-2010-26/+32
| | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380
* | Merge branch '26066-wrong-messsage-for-unregistered-u2f-device-on-sign-in' ↵Fatih Acet2017-01-203-10/+10
| | | | | | | | | | | | | | | | | | | | into 'master' New U2F ineligible message Closes #26066 See merge request !8392
* | Merge branch '25507-handle-errors-environment-list' into 'master' Fatih Acet2017-01-202-47/+72
| | | | | | | | | | | | | | Resolve "Error handling in environments list" Closes #25507 See merge request !8461
* | Merge branch '26601-dropdown-makes-request-close' into 'master' Fatih Acet2017-01-201-10/+11
| | | | | | | | | | | | | | Fixes builds dropdown making request when clicked to be closed Closes #26601 See merge request !8545
* | Merge branch '26472-math-margin' into 'master' Fatih Acet2017-01-201-1/+1
| | | | | | | | | | | | | | Add margin to math blocks Closes #26472 See merge request !8543
* | Merge branch 'didemacet-markdown-area-height-fix' into 'master' Fatih Acet2017-01-201-0/+11
| | | | | | | | | | | | | | Autoresize markdown preview Closes #24372 See merge request !8607
* | Merge branch 'milestone-issuable-row-numbers' into 'master' Fatih Acet2017-01-202-3/+2
| | | | | | | | | | | | | | Fixed some HAML errors on milestone#show Closes #26799 and #26772 See merge request !8560
* | Merge branch '26803-typing-then-tab-in-a-comment-doesn-t-select-the-author' ↵Fatih Acet2017-01-201-1/+2
| | | | | | | | | | | | | | | | | | | | into 'master' Fixed highlightFirst and added specs Closes #26803 See merge request !8622
* | Merge branch 'input-button-hover' into 'master' Fatih Acet2017-01-201-1/+1
| | | | | | | | | | Add hover state to MR comment reply button See merge request !8541
* | Merge branch ↵Fatih Acet2017-01-206-69/+124
| | | | | | | | | | | | | | | | | | | | '24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master' Update project visibility level ui to use dropdowns Closes #24296, #24123, and #24032 See merge request !7645
* | Merge branch 'fix/external-status-badge-links' into 'master' Kamil Trzciński2017-01-201-0/+10
| | | | | | | | | | | | | | Link external commit status badges to target URLs Closes #25662 See merge request !8611
* | Merge branch 'zj-fix-admin-templates' into 'master' Kamil Trzciński2017-01-202-73/+75
|/ | | | | | | Fix Slash command templates Closes #26042 See merge request !8320
* Merge commit 'e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1' into 8-16-stableJames Lopez2017-01-195-26/+27
|\ | | | | | | | | # Conflicts: # app/assets/javascripts/vue_pipelines_index/stage.js.es6
| * Synchronize all project authorization refreshingrefresh-authorizations-tighter-leaseYorick Peterse2017-01-161-21/+20
| | | | | | | | | | | | | | | | | | Previously a lease would only be obtained to update data. This could lead to duplicate data being inserted, triggering a UNIQUE constraint error. To work around this we now acquire a lease before performing _any_ project authorization work, releasing it at the very end. Fixes #25987
| * Merge branch '26616-fix-search-group-project-filters' into 'master' Alfredo Sumaran2017-01-162-1/+7
| |\ | | | | | | | | | | | | | | | | | | Fix search group/project filtering to show results Closes #26616 See merge request !8565
| | * Fix dropdown filter input value after blur26616-fix-search-group-project-filtersEric Eastwood2017-01-161-1/+1
| | |
| | * Fix group/project filters on search pageEric Eastwood2017-01-161-0/+6
| | |
| * | Merge branch 'pipeline_index_mini_graph_fix' into 'master' Fatih Acet2017-01-161-13/+6
| |\ \ | | | | | | | | | | | | | | | | Pipeline Index Mini Graph Fix See merge request !8542
| | * | phil said this is good - no need to dynamically update since this is a ↵pipeline_index_mini_graph_fixRegis2017-01-151-49/+7
| | | | | | | | | | | | | | | | static page for now
| | * | works in browsers without sourceCapabilities APIRegis2017-01-151-1/+4
| | | |
| | * | update commented documentation to reflect new changesRegis2017-01-151-2/+3
| | | |
| | * | Merge branch 'master' into pipeline_index_mini_graph_fixRegis2017-01-151-1/+1
| | |\ \
| | * | | fix clicking url bar, browser UI, dev tools collapsing the mini_graphRegis2017-01-151-1/+3
| | | | |
| | * | | fix UI without Promise or timeOut/intervalRegis2017-01-151-2/+9
| | | | |
| | * | | fix UI behaviourRegis2017-01-151-1/+1
| | | | |
| | * | | Merge branch 'master' into pipeline_index_mini_graph_fixRegis2017-01-1573-319/+2689
| | |\ \ \
| | * | | | make tests pass - change a bit of logicRegis2017-01-121-6/+8
| | | | | |
| | * | | | fixed issue - description in function (check diff)Regis2017-01-121-3/+23
| | | | | |
| * | | | | Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master' Robert Speicher2017-01-162-8/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure updating project settings shows a flash message on success See merge request !8579
| | * | | | | Add a spec and actually display the flash noticeRémy Coutable2017-01-162-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Fix to display notice when project settings updated.sandish chen2017-01-152-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change validity checking for UpdateService. Add return value for project update service. Return 302(redirect_to) when successfully updated. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Merge branch '26207-add-hover-animations' into 'master' Annabel Dunstone Gray2017-01-1611-9/+141
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add Hover animations" Closes #26207 See merge request !8415
| | * | | | | | fixed nav-links margin with recommended fixdimitrieh2017-01-161-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove margin on mobile links
| | * | | | | | Merge branch 'master' into '26207-add-hover-animations'Dimitrie Hoekstra2017-01-05112-923/+1044
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/variables.scss
| | * | | | | | | added the same to .header-user-avatar to make it consistentdimitrieh2017-01-052-1/+11
| | | | | | | | |
| | * | | | | | | made avatar border color really subtle and not distracting, plus doesn't act ↵dimitrieh2017-01-052-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on not links anymore
| | * | | | | | | fixed bell transition animationdimitrieh2017-01-041-1/+1
| | | | | | | | |
| | * | | | | | | removed darkening hover state and animation color labelsdimitrieh2017-01-042-8/+0
| | | | | | | | |
| | * | | | | | | fix rake scss linting errorsdimitrieh2017-01-033-5/+5
| | | | | | | | |
| | * | | | | | | added additional hover animations, fixed up avatarsdimitrieh2017-01-039-5/+61
| | | | | | | | |
| | * | | | | | | hover animations for award buttons, buttons, dropdowns, rows in file list, ↵dimitrieh2017-01-034-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | links, navigation tabs, labels
| * | | | | | | | Merge branch '25946-manual-pipeline-dropdown-casing' into 'master' Alfredo Sumaran2017-01-162-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retain original casing for build name in manual pipeline dropdown Closes #25946 See merge request !8387
| | * | | | | | | Retain original casing for build name in manual pipeline dropdown25946-manual-pipeline-dropdown-casingSam Rose2017-01-162-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch '22111-remove-lock-icon-on-protected-tag' into 'master' Clement Ho2017-01-161-1/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Lock Icon on Protected Tag Closes #22111 See merge request !8513
| | * | | | | | | | Remove Lock Icon on Protected TagSergey Nikitin2017-01-141-1/+0
| | | | | | | | | |
| * | | | | | | | | Merge branch 'fix/diff-title' into 'master' Alfredo Sumaran2017-01-164-25/+27
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue with diff comments path See merge request !7819
| | * | | | | | | | | fixed commit diff linking and added specsfix/diff-titleLuke "Jared" Bennett2017-01-144-25/+27
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'speed-up-dashboard-milestone-index' into 'master' Sean McGivern2017-01-192-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up dashboard milestone index by scoping IssuesFinder to user authorized projects See merge request !8524