summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-3015-27/+33
|\ | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| * fix notification_service specsValery Sizov2015-11-301-0/+2
| |
| * Migrate mailers to ActiveJobValery Sizov2015-11-264-3/+7
| |
| * Rails update to 4.2.4Valery Sizov2015-11-2514-24/+24
| |
* | Merge branch 'rs-build-ssh-path-prefix' into 'master' Douwe Maan2015-11-301-3/+5
|\ \ | | | | | | | | | | | | | | | | | | Simplify `build_gitlab_shell_ssh_path_prefix` See merge request !1928
| * | Simplify `build_gitlab_shell_ssh_path_prefix`rs-build-ssh-path-prefixRobert Speicher2015-11-291-3/+5
| |/
* | Gracefully handle when Redis is not availableStan Hu2015-11-261-2/+7
| |
* | Expire application settings from cache at startupStan Hu2015-11-251-0/+4
|/ | | | | | | | If a DB migration occurs, there's a chance that the application settings are loaded from the cache and provide stale values, causing Error 500s. This ensures that at startup the settings are always refreshed. Closes #3643
* Merge branch 'sherlock-total-query-time' into 'master' Yorick Peterse2015-11-251-0/+1
|\ | | | | | | | | | | | | | | Added total query time to Sherlock This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used). See merge request !1887
| * Added total query time to Sherlocksherlock-total-query-timeYorick Peterse2015-11-241-0/+1
| | | | | | | | | | This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used).
* | Also fallback to a default value if none is set.session_expire_delay_cannot_be_nilMarin Jankovski2015-11-241-2/+2
| |
* | Maybe rescue session_expire_delay by setting a default value.Marin Jankovski2015-11-241-0/+1
|/
* Expose artifacts pathci-artifacts-pathKamil Trzcinski2015-11-232-1/+14
|
* Merge branch 'lfs_default_and_backup' into 'master' Dmitriy Zaporozhets2015-11-202-2/+2
|\ | | | | | | | | | | | | Lfs default and backup Part of gitlab-org/gitlab-ce#2955 See merge request !1823
| * Lfs on by default.Marin Jankovski2015-11-192-2/+2
| |
* | award emojiValery Sizov2015-11-191-0/+4
|/
* Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-171-1/+1
|\ | | | | | | | | | | | | | | | | | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a. Reverts https://github.com/gitlabhq/gitlabhq/pull/9820 See merge request !1804
| * Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-161-1/+1
| | | | | | | | | | This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
* | Create milestones in the groupDmitriy Zaporozhets2015-11-161-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add support for git lfs.lfsMarin Jankovski2015-11-163-3/+16
|
* Disabling cache for test environmentValery Sizov2015-11-162-9/+13
|
* Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-141-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor login as to be impersonation with better login/logout Modifies the existing "login as" feature to be called impersonation. This also adds: * Application keep track of who is impersonating the user so they can revert back to the original user without having to log out. * Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop. ## Screenshots: ![](http://sindacio.us/i/2015-10-28_17-52-41.png) ![](http://sindacio.us/i/2015-10-28_17-53-08.png) See merge request !1702
| * refactor login as to be impersonation with better login/logoutJames Newton2015-10-291-1/+3
| | | | | | | | | | | | Modifies the existing "login as" feature to be called impersonation, as well as keeping track of who is impersonating to revert back to that user without having to log out.
* | Expose CI enable option in project featuresKamil Trzcinski2015-11-132-0/+2
| | | | | | | | - Enable CI by default for all new projects
* | Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-listDmitriy Zaporozhets2015-11-121-1/+1
|\ \ | | | | | | Avoid render edit_form in each notes.
| * | Avoid render edit_form in each notes.Jason Lee2015-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes).
* | | Merge branch 'ci-deprecate-dumped-yaml' into 'master' Kamil Trzciński2015-11-121-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated dumped yaml file generated from previous job definitions See merge request !1777
| * | | Remove deprecated dumped yaml file generated from previous job definitionsci-deprecate-dumped-yamlKamil Trzcinski2015-11-101-1/+0
| | | |
* | | | Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-112-0/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Build Artifacts This implements #3028 1. It stores artifacts in shared/artifacts, 1. It adds `artifacts` to `.gitlab-ci.yml`, 1. We use GitLab Workhorse to offload artifacts uploading, 1. To download artifacts it uses GitLab Workhorse X-Sendfile extension, 1. There's one "artifact" per-build. The new upload removes previous one and creates a new one, 1. Default max artifact size is set to 100MB - this can be changed in settings. Missing things: 1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files, 1. Artifacts passing between builds. GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5 GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46 Syntax: ``` artifacts: untracked: true # default: false paths: # default: empty - bin/files ``` See merge request !1584
| * | | Final fixesKamil Trzcinski2015-11-101-1/+1
| | | |
| * | | Implement Build ArtifactsKamil Trzcinski2015-11-102-0/+2
| |/ / | | | | | | | | | | | | | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
* | | Merge branch 'state-machine-to-state-machines-activerecord' into 'master' Dmitriy Zaporozhets2015-11-101-9/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Switch to state_machines-activerecord (Fixes: #3374) state_machine is unmaintained See merge request !1764
| * | remove state_machine_patch.rbPirate Praveen2015-11-091-9/+0
| | |
| * | Switch to state_machines-activerecord (Fixes: #3374)Pirate Praveen2015-11-081-1/+1
| | |
* | | Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-101-1/+4
|\ \ \ | | | | | | | | | | | | 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-051-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | More release related logic to separate resourceDmitriy Zaporozhets2015-11-051-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add edit/update tag actions for future release notesDmitriy Zaporozhets2015-11-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'fix-incoming-email-default' into 'master' Robert Speicher2015-11-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incoming email config defaults Fixes #3377. See merge request !1766
| * | | | Fix incoming email config defaultsfix-incoming-email-defaultDouwe Maan2015-11-091-2/+2
| | | | |
* | | | | Track the amount of times views are renderedYorick Peterse2015-11-091-0/+1
| | | | |
* | | | | Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-094-10/+54
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | | | Enable shared runners for all new projectsKamil Trzcinski2015-11-051-4/+5
| |/ / |/| |
* | | CI details cleanupKamil Trzcinski2015-11-051-4/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 'facebook-auth' into 'master' Robert Speicher2015-11-041-11/+12
|\ \ | | | | | | | | | | | | Add Facebook authentication See merge request !1740
| * | Add Facebook authenticationDouwe Maan2015-11-031-11/+12
| | |
* | | Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-031-3/+3
|/ / | | | | | | Closes #3311
* | Remove inflector rule that makes commits uncountableDmitriy Zaporozhets2015-11-031-21/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'shared-file-access' into 'master' Dmitriy Zaporozhets2015-10-292-1/+9
|\ \ | | | | | | | | | | | | | | | | | | Start putting shared files in "shared" See merge request !1691
| * | Start putting shared files in "shared"Jacob Vosmaer2015-10-262-1/+9
| | |
View Lorry Controller Status