summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue-search-token-position' into 'master' Jacob Schatz2017-01-218-41/+165
| | | | | Filtered search input click back at token See merge request !8617
* Merge branch 'keep_mini_graph_down_pipelines_index' into 'master' Fatih Acet2017-01-211-3/+28
| | | | | Keep mini graph down pipelines index See merge request !8651
* Merge branch ↵Jacob Schatz2017-01-211-7/+7
| | | | | | | | | | '26617-search-bar-filter-dropdown-does-not-dismiss-when-sort-dropdown-is-selected' into 'master' Changed the event listener target from window to document in droplab Closes #26617 See merge request !8670
* Merge branch ↵Jacob Schatz2017-01-211-0/+10
| | | | | | | | | | '26623-search-bar-dropdown-doesn-t-load-when-you-go-back-in-browser-history' into 'master' Fixed search component not instantiating back when pressing the back button on the issue page Closes #26623 See merge request !8676
* Merge branch '26955-handle-legacy-issue-filter-params' into 'master' Jacob Schatz2017-01-213-1/+37
| | | | | | | Resolve "Filter issues input does not show assignee name when there is an assignee ID in the URL" Closes #26955 See merge request !8674
* Merge branch 'fix/pipeline-ref-path-serialization' into 'master' Kamil Trzciński2017-01-213-4/+22
| | | | | | | Do not generate pipeline ref path if ref not present Closes #26861 See merge request !8658
* Merge branch 'fix-upload-group-avatar' into 'master' Stan Hu2017-01-212-3/+3
| | | | | | | Button by itself will submit forms. Button type button willn't Closes #26999 See merge request !8694
* Merge branch 'button-alignment' into 'master' Fatih Acet2017-01-212-2/+1
| | | | | Fix small button alignment issues See merge request !8631
* Merge branch 'add-index-on-ci-builds' into 'master' Stan Hu2017-01-213-1/+37
| | | | | Add index for ci_builds that makes shared runners query to run 100x faster. See merge request !8683
* Merge branch 'fix_auto_merging' into 'master' Grzegorz Bizon2017-01-214-26/+86
| | | | | | | Fix Merge When Pipeline Succeeds immediate merge bug Closes #26969 See merge request !8685
* Merge branch 'fix/revert-removing-build-tab-again' into '8-16-stable' Kamil Trzciński2017-01-2121-25/+141
|\ | | | | | | | | Revert removing builds tab on '8-16-stable' See merge request !8661
| * Revert removing builds tab on '8-16-stable'fix/revert-removing-build-tab-againGrzegorz Bizon2017-01-2021-25/+141
| | | | | | | | | | | | | | | | This reverts commit 79a816f3bca839aadbaf7af92ac0c0d30dc8a8b7, reversing changes made to 68d89aa96b1ae7ea742cc5ac708bd8d08492826b. Conflicts: app/views/projects/merge_requests/_show.html.haml
* | Update VERSION to 8.16.0-rc6v8.16.0-rc6DJ Mountney2017-01-201-1/+1
| |
* | Update VERSION to 8.16.0-rc5v8.16.0-rc5James Lopez2017-01-201-1/+1
| |
* | Merge branch 'participants-list' into 'master' Fatih Acet2017-01-202-0/+8
| | | | | | | | | | Fix participants margins to fit on one line See merge request !8640
* | Merge branch 'fix-shared-runners-queue-update' into 'master' Rémy Coutable2017-01-203-3/+60
| | | | | | | | | | Fix shared runners queue update See merge request !8663
* | Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-205-23/+93
| | | | | | | | | | | | | | Fix import no longer mapping users as admin Closes #25346 See merge request !8625
* | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' Yorick Peterse2017-01-203-5/+33
| | | | | | | | | | | | | | Record used SSH keys only once per day Closes #26877 See merge request !8655
* | Merge branch 'workhorse-v1.3.0' into 'master' Rémy Coutable2017-01-201-1/+1
| | | | | | | | | | Use Workhorse v1.3.0 See merge request !8660
* | Merge branch '25851-document-token-scopes' into 'master' Rémy Coutable2017-01-202-3/+13
| | | | | | | | | | | | | | Add documentation around OAuth/Personal Access Token scopes. Closes #25851 See merge request !8226
* | Merge branch '21698-redis-runner-last-build' into 'master' Kamil Trzciński2017-01-2011-7/+175
| | | | | | | | | | 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-2020-45/+71
| | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380
* | Merge branch '26868-fix-duplicate-backported-migrations' into 'master' Robert Speicher2017-01-204-68/+35
| | | | | | | | | | | | | | Rename duplicate migrations and skip them if table/columns are already present Closes #26868 See merge request !8644
* | Merge branch 'ci-submodule-doc-update' into 'master' Tomasz Maczukin2017-01-202-1/+47
| | | | | | | | | | Document GIT_SUBMODULE_STRATEGY See merge request !8586
* | 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 'improve-public_access-documentation' into 'master' Achilleas Pipinellis2017-01-202-3/+6
| | | | | | | | | | Add an image to the public access documentation and fix wrong profile path See merge request !8583
* | Merge branch '25507-handle-errors-environment-list' into 'master' Fatih Acet2017-01-206-48/+218
| | | | | | | | | | | | | | Resolve "Error handling in environments list" Closes #25507 See merge request !8461
* | Merge branch '26601-dropdown-makes-request-close' into 'master' Fatih Acet2017-01-203-15/+21
| | | | | | | | | | | | | | 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-202-1/+5
| | | | | | | | | | | | | | Add margin to math blocks Closes #26472 See merge request !8543
* | Merge branch 'didemacet-markdown-area-height-fix' into 'master' Fatih Acet2017-01-203-0/+42
| | | | | | | | | | | | | | Autoresize markdown preview Closes #24372 See merge request !8607
* | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-204-1/+41
| | | | | | | | | | Gitaly feature flag See merge request !8440
* | Merge branch 'brakeman-upgrade' into 'master' Robert Speicher2017-01-202-3/+3
| | | | | | | | | | | | | | Upgrade Brakeman to 3.4.1 Closes #26820 See merge request !8629
* | Merge branch 'patch-9' into 'master' Fatih Acet2017-01-201-10/+68
| | | | | | | | | | Add documentation for possible causes of JS-related test failures. See merge request !8214
* | 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-203-1/+106
| | | | | | | | | | | | | | | | | | | | into 'master' Fixed highlightFirst and added specs Closes #26803 See merge request !8622
* | Merge branch 'input-button-hover' into 'master' Fatih Acet2017-01-202-1/+5
| | | | | | | | | | Add hover state to MR comment reply button See merge request !8541
* | Merge branch ↵Fatih Acet2017-01-2010-70/+276
| | | | | | | | | | | | | | | | | | | | '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 'document-auto_link_ldap_user' into 'master' Achilleas Pipinellis2017-01-201-0/+10
| | | | | | | | | | Document the `auto_link_ldap_user` setting See merge request !8568
* | Merge branch 'fix/external-status-badge-links' into 'master' Kamil Trzciński2017-01-2010-30/+220
| | | | | | | | | | | | | | 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-203-73/+101
|/ | | | | | | Fix Slash command templates Closes #26042 See merge request !8320
* Update VERSION to 8.16.0-rc4v8.16.0-rc4Robert Speicher2017-01-191-1/+1
|
* Merge branch 'rs-revert-sassc' into 'master' Robert Speicher2017-01-193-17/+8
| | | | | | | Revert "Merge branch 'switch-to-sassc' into 'master'" Closes #26762 See merge request !8642
* Merge commit 'e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1' into 8-16-stableJames Lopez2017-01-1910-35/+76
|\ | | | | | | | | # Conflicts: # app/assets/javascripts/vue_pipelines_index/stage.js.es6
| * Merge branch 'switch-to-sassc' into 'master' Robert Speicher2017-01-173-8/+17
| |\ | | | | | | | | | | | | | | | | | | Switch to sassc-rails Closes #18432 See merge request !8556
| | * Switch to sassc-railsRichard Macklin2017-01-163-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18432 This uses sassc to compile the application's SASS so it compiles faster. Without attempting to be very scientific here are some numbers I got: Using sassc-rails: ``` [1] pry(main)> Benchmark.bm { |bm| bm.report { Rails.application.assets["application.css"] } } user system total real 1.430000 0.380000 1.810000 ( 1.830753) ``` Using sass-rails: ``` [1] pry(main)> Benchmark.bm { |bm| bm.report { Rails.application.assets["application.css"] } } user system total real 12.320000 0.530000 12.850000 ( 12.909684) ``` The result is faster page loads when changing CSS in development and faster precompilation.
| * | Merge branch '19633-remove-rerun' into 'master' Robert Speicher2017-01-173-15/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove rerun since it's not used anymore Closes #19633 See merge request !8598
| | * | Remove rerun since it's not used anymore19633-remove-rerunRémy Coutable2017-01-163-15/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'refresh-authorizations-tighter-lease' into 'master' Robert Speicher2017-01-173-41/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synchronize all project authorization refreshing work using a lease Closes #25987 See merge request !8599
| | * | | Synchronize all project authorization refreshingrefresh-authorizations-tighter-leaseYorick Peterse2017-01-163-41/+44
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'boards-sidebar-spec-fix' into 'master' Rémy Coutable2017-01-171-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed random issue boards sidebar failure Closes #26751 See merge request !8602