summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-0929-23/+855
| | | | | | | | | | | | | | | | | | | | | | | | | Sherlock will be a new GitLab specific tool for measuring the performance of Rails requests (and SideKiq jobs at some point). Some of the things that are currently tracked: * SQL queries along with their timings, backtraces and query plans (using "EXPLAIN ANALYZE" for PostgreSQL and regular "EXPLAIN" for MySQL) * Timings of application files (including views) on a per line basis * Some meta data such as the request method, path, total duration, etc More tracking (e.g. Rugged or gitlab-shell timings) might be added in the future. Sherlock will replace any existing tools we have used so far (e.g. active_record_query_trace and rack-mini-profiler), hence the corresponding Gems have been removed from the Gemfile. Sherlock can be enabled by starting Rails as following: ENABLE_SHERLOCK=1 bundle exec rails s Recorded transactions can be found at `/sherlock/transactions`.
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-0914-15/+86
|\
| * Merge branch 'fix-commits-manual-merge' into 'master' Douwe Maan2015-11-093-4/+24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where manually merged branches in a MR would end up with an empty diff This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens: 1. User create a new branch `foo`. 2. User creates a merge request for `foo`. 3. User merges `foo` into `master` by hand. 4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff. 5. `RefreshService` then closes the MR. This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens. Closes #3314 See merge request !1758
| | * Add spec for manual merge of merge requestStan Hu2015-11-061-0/+19
| | |
| | * Fix bug where manually merged branches in a MR would end up with an empty diffStan Hu2015-11-052-4/+5
| | | | | | | | | | | | Closes #3314
| * | Merge branch 'shared_runners' into 'master' Kamil Trzciński2015-11-0912-11/+62
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable shared runners for all new projects This adds Admin Setting option to enable shared runners for all new projects, and by default it is set to true. /cc @dzaporozhets @sytses See merge request !1738
| | * | Fix testsshared_runnersKamil Trzcinski2015-11-083-3/+31
| | | |
| | * | Enable shared runners for all new projectsKamil Trzcinski2015-11-059-8/+31
| | | |
* | | | Merge pull request #9756 from Soullivaneuh/patch-1Jeroen van Baarsen2015-11-091-2/+3
|\ \ \ \ | | | | | | | | | | Add GitLabCI code coverage regex sample for PHPUnit
| * | | | Add GitLabCI code coverage regex sample for PHPUnitSullivan SENECHAL2015-11-091-2/+3
|/ / / /
* | | | Merge pull request #9813 from axilleas/fix_piwik_templateJeroen van Baarsen2015-11-081-8/+10
|\ \ \ \ | |/ / / |/| | | Update piwik template
| * | | Update piwik templateAchilleas Pipinellis2015-11-081-8/+10
|/ / /
* | | Merge branch 'markdown-form-hint' into 'master' Dmitriy Zaporozhets2015-11-074-12/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render same markdown hint for issue, merge request, wiki and comment forms Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2595 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1763
| * | | Render same markdown hint for issue, merge request, wiki and comment formsmarkdown-form-hintDmitriy Zaporozhets2015-11-074-12/+8
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #9782 from gitlabhq/jvanbaarsen-patch-1Robert Schilling2015-11-071-2/+2
|\ \ \ | | | | | | | | Fixed markdown issue in PROCESS.md
| * | | Fixed markdown issue in PROCESS.mdJeroen van Baarsen2015-11-071-2/+2
| | | |
* | | | Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-providerJeroen van Baarsen2015-11-071-19/+27
|\ \ \ \ | | | | | | | | | | Hide tab-bar in login-box when only one tabs is shown.
| * | | | Hide tab-bar in login-box when only one tabs is shown.Christian Speich2015-11-071-19/+27
|/ / / /
* | | | Merge branch 'small-ui-improvements' into 'master' Dmitriy Zaporozhets2015-11-076-5/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small UI improvements to merge request page Make gray block under tabs identical height. Also same height have blocks on pages like `Groups` etc. So this improvement is targeted for consistency in UI too Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes internal issues * https://dev.gitlab.org/gitlab/gitlabhq/issues/2591 * https://dev.gitlab.org/gitlab/gitlabhq/issues/2592 cc @DouweM See merge request !1759
| * | | | Small UI improvements to merge request pagesmall-ui-improvementsDmitriy Zaporozhets2015-11-066-5/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge pull request #9807 from SkySymbol/fix_line_orderRobert Schilling2015-11-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix line order in installation docs
| * | | | | It makes more sense like thisVincent Lequertier2015-11-041-1/+1
| | | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-0651-241/+280
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix_doc_ci_links' into 'master' Achilleas Pipinellis2015-11-051-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI permissions and api links to README See merge request !1756
| | * | | | | | Add CI permissions and api links to README [ci skip]Achilleas Pipinellis2015-11-051-0/+2
| |/ / / / / /
| * | | | | | Remove duplicate documentation linksAchilleas Pipinellis2015-11-051-16/+11
| | | | | | |
| * | | | | | Merge branch 'reversible_migration' into 'master' Dmitriy Zaporozhets2015-11-053-3/+13
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make migrations reversible See merge request !1753
| | * | | | | make migrations reversibleValery Sizov2015-11-053-3/+13
| | | | | | |
| * | | | | | Merge branch 'ci-details' into 'master' Douwe Maan2015-11-0536-185/+161
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some polish to CI integration Check the list of commits to see what I changed. cc @dzaporozhets @rspeicher I'd love to get this into 8.1, since it's mostly refactoring/tweaking of stuff that was _introduced_ in 8.1. Fixes #2645. See merge request !1641
| | * | | | | Add missing stage to builds viewKamil Trzcinski2015-11-051-1/+1
| | | | | | |
| | * | | | | CI details cleanupKamil Trzcinski2015-11-0536-184/+160
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add page titles to CI settings. - Fix CI admin navigation. - Remove duplicated scope. - Use monospace font for commit sha. - Add page title and header title to build page. - Proper authorization for cancel/retry builds. - Use gitlab pagination theme for builds and group members. - Don't paginate builds widget on build page. - Add badges to commit page Changes/Builds tabs. - Add "Builds" to commit Builds tab page title. - Add and use Ci::Build#retryable? method. - Add CI::Build#retried? method. - Allow all failed commit builds to be retried. - Proper authorization for cancel/retry all builds. - Remove unused param. - Use time_ago_with_tooltip where appropriate. - Tweak builds index text - Remove duplication between builds/build and commit_statuses/commit_status. - Use POST rather than GET for canceling and retrying builds. - Remove redundant URL helpers. - Add build ID to build page. - Link branch name on build page. - Move commit/:sha/ci to commit/:sha/builds.
| * | | | | Merge branch 'public_groups' into 'master' Valery Sizov2015-11-0511-37/+93
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow groups to appear in the search results if the group owner allows it https://dev.gitlab.org/gitlab/gitlabhq/issues/2565 See merge request !1751
| | * | | | | Allow groups to appear in the search results if the group owner allows itValery Sizov2015-11-0511-37/+93
| |/ / / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-11-065-11/+12
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9730 from ImanMh/masterDmitriy Zaporozhets2015-11-061-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | ugly outlines removed form sidebar
| | * | | | | | ugly outlines removed form sidebarIman Mohamadi2015-10-141-0/+3
| | | | | | | |
| * | | | | | | Merge pull request #9788 from Thirumal-Sakthivel/select_box_uiDmitriy Zaporozhets2015-11-063-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | form-control class added to select box
| | * | | | | | | defined class prepend-top-10 used for alignment issueThirumal S2015-11-052-5/+1
| | | | | | | | |
| | * | | | | | | merge conflict fixedThirumal S2015-11-03517-3823/+7792
| | |\ \ \ \ \ \ \
| | * | | | | | | | form group alignment issue fixed in webhook index pageThirumal S2015-10-302-1/+5
| | | | | | | | | |
| | * | | | | | | | form-control class to select boxThirumal S2015-10-301-1/+1
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #9804 from ↵Dmitriy Zaporozhets2015-11-051-8/+6
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | trimentor/9722-fix-alignment-of-event-items-and-its-children 9722 fix alignment of event items and its children
| | * | | | | | | Add right margin to event-body..Kjel Delaey2015-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise text will flow under the "timeago" element. The original value was 80px (see commit 8b0906c8), but a value of 174px makes more sense. (see event-title `calc` function).
| | * | | | | | | Make sure that multi-commit rows inside event bodies are aligned properly..Kjel Delaey2015-11-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent the second, third, ... rows from having a different indentation than the first commit row. Adding the extra "15px padding" to the event item prevents this. Having a 15px margin on the avatar only doesn't prevent this from happening.
| | * | | | | | | Combine selectors because the same style is being appliedKjel Delaey2015-11-041-4/+1
| | | | | | | | |
| | * | | | | | | Apply the same rules to block event items..Kjel Delaey2015-11-041-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Try to avoid alignment issues as well.
| | * | | | | | | Style inline event items with titles containing long words properly..Kjel Delaey2015-11-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a tablet in portrait mode with a width of 768px the event-title isn't aligned properly when the title contains a long string. This also happens when resizing your browser viewport on a desktop. Example string: Administrator pushed new branch feature-branch-with-a-very-long-name at Gitlab Org / Gitlab Test In the UI it would look like the example below: ---------- | | | AVATAR | less than a minute ago | | ---------- Administrator pushed new branch feature-branch-with-a-very-long-name at...
* | | | | | | | | Merge branch 'one-link-in-emails' into 'master' Dmitriy Zaporozhets2015-11-061-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only have one link in emails to make clicking it easier. See merge request !1937
| * | | | | | | | Only have one link in emails to make clicking it easier.Sytse Sijbrandij2015-11-051-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-051-1/+1
|\ \ \ \ \ \ \ \
View Lorry Controller Status