summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Send build name and stage in CI notification e-mailci-build-name-in-notification-emailKamil Trzcinski2015-11-105-0/+13
|
* Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-1029-60/+284
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add missing param and title for tagrelease-notesDmitriy Zaporozhets2015-11-093-4/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor release code a bitDmitriy Zaporozhets2015-11-095-15/+15
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Better englishDmitriy Zaporozhets2015-11-061-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add tests to release notes featureDmitriy Zaporozhets2015-11-065-7/+50
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add association and validation for Release modelDmitriy Zaporozhets2015-11-061-0/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Small UI improvements to new git tag pageDmitriy Zaporozhets2015-11-062-7/+11
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix testDmitriy Zaporozhets2015-11-062-4/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix list rendering issue when dropdown was hidden in rowDmitriy Zaporozhets2015-11-062-2/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Rewrite remove tag testDmitriy Zaporozhets2015-11-062-27/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add changelog item and remove release labels for tags listDmitriy Zaporozhets2015-11-062-3/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Retyle tag show pageDmitriy Zaporozhets2015-11-051-14/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve UI for tags pageDmitriy Zaporozhets2015-11-055-27/+33
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * After tag is created - redirect to tag pageDmitriy Zaporozhets2015-11-051-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add release description to new tag formDmitriy Zaporozhets2015-11-053-1/+28
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Create show page for tag and render release notes there and on index pageDmitriy Zaporozhets2015-11-059-20/+47
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add ability to edit and show release notesDmitriy Zaporozhets2015-11-057-9/+60
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * More release related logic to separate resourceDmitriy Zaporozhets2015-11-058-11/+46
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add release modelDmitriy Zaporozhets2015-11-055-1/+42
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add edit/update tag actions for future release notesDmitriy Zaporozhets2015-11-054-1/+11
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' into 'master' Achilleas Pipinellis2015-11-101-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Change documentation of converting a MySQL-Database to a Postgres one The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904 closes #2904 See merge request !1549
| * | Changed documentation of converting a MySQL-Database with Gitlab to a ↵Tim Jabs2015-11-041-0/+4
| | | | | | | | | | | | Postgresdatatabase. The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904
* | | Merge branch 'stanhu/gitlab-ce-bump-gitlab-git-and-other-gems'Douwe Maan2015-11-093-19/+19
|\ \ \
| * | | Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3.Stan Hu2015-11-093-19/+17
| | | | | | | | | | | | | | | | Switch back to github-linguist
* | | | Update monthly release issue templateRobert Speicher2015-11-091-35/+51
| | | | | | | | | | | | | | | | [ci skip]
* | | | Update CHANGELOGRobert Speicher2015-11-091-4/+6
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-0943-63/+1727
|\ \ \ \
| * \ \ \ Merge branch 'fix-incoming-email-default' into 'master' Robert Speicher2015-11-092-2/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix incoming email config defaults Fixes #3377. See merge request !1766
| | * | | Fix incoming email config defaultsfix-incoming-email-defaultDouwe Maan2015-11-092-2/+3
| | | | |
| * | | | Merge branch 'accept_mr_btn_ci_status' into 'master' Dmitriy Zaporozhets2015-11-092-1/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge button has color from CI status This MR closes #3313 I'am not realy sure about the color for the skipped status (red)... UI changes: ![accpet-mr-ci-failed](/uploads/c03970c468b89e38ed2c5e3171f53505/accpet-mr-ci-failed.png) ![accpet-mr-ci-skipped](/uploads/f29cbc69e77cc95b33522135b327cc51/accpet-mr-ci-skipped.png) ![accpet-mr-ci-pending](/uploads/79612a66fd497174e00bd348c9cba69c/accpet-mr-ci-pending.png) ![accpet-mr-ci-success](/uploads/4b601e6d02b860db5ff53c47c98f3206/accpet-mr-ci-success.png) See merge request !1761
| | * | | | Merge button has color from CI statusBaldinof2015-11-062-1/+17
| | | | | |
| * | | | | Only load rblineprof when actually neededYorick Peterse2015-11-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the application can still boot when the "development" group is not available.
| * | | | | Merge branch 'sherlock' into 'master' Yorick Peterse2015-11-0940-60/+1706
| |\ \ \ \ \ | | | | | | | | | | | | | | See merge request !1749
| | * | | | | Added changelog entry for SherlockYorick Peterse2015-11-091-0/+1
| | | | | | |
| | * | | | | Truncate transaction paths to 70 charactersYorick Peterse2015-11-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that long URLs don't completely mess up the layout of the table.
| | * | | | | Track the amount of times views are renderedYorick Peterse2015-11-094-14/+103
| | | | | | |
| | * | | | | Added navigation link to SherlockYorick Peterse2015-11-091-0/+5
| | | | | | |
| | * | | | | Fixed Hash key style in Sherlock::Query specYorick Peterse2015-11-091-1/+1
| | | | | | |
| | * | | | | Updated profiling guides for SherlockYorick Peterse2015-11-091-37/+8
| | | | | | |
| | * | | | | Added specs and source documentation for SherlockYorick Peterse2015-11-0916-12/+758
| | | | | | |
| | * | | | | 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 pull request #9814 from Totof6942/patch-ui-graphs-headerDmitriy Zaporozhets2015-11-095-5/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Apply new header design for project graphs page
| * | | | | Fix typo.Christophe Poulette2015-11-081-1/+1
| | | | | |
| * | | | | Fix typoChristophe Poulette2015-11-081-1/+1
| | | | | |
| * | | | | Apply new design for project graphs pageChristophe Poulette2015-11-085-6/+18
| | | | | |
* | | | | | 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
View Lorry Controller Status