summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | 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
| | | |/ | | |/|
| * | | Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-281-2/+0
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove the contents of the satellites dirremove-satellitesJacob Vosmaer2015-10-232-3/+7
| |/
* | Added housekeeping for git repositoriesJeroen Nijhof2015-10-211-0/+1
|/
* Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-179-34/+118
|\
| * Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-154-1/+43
| |\
| | * Fixed Rubocop styling issuesYorick Peterse2015-10-151-4/+4
| | |
| | * Added rack-lineprof for developmentYorick Peterse2015-10-152-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to measure the time (roughly) spent on a per line basis. This can also be used to measure timings for views, for example by adding the following to a URL: ?lineprof=app/views/projects/notes/_note rack-lineprof is only enabled when: 1. The application runs in development mode 2. The used Ruby is MRI 3. The environment variable ENABLE_LINEPROF is set to a non-empty value
| | * Added active_record_query_traceYorick Peterse2015-10-151-0/+5
| | | | | | | | | | | | | | | | | | | | | This can be used to track down where queries originate from, regardless of whether they're caused by N+1 problems or not. This can be enabled by setting the environment variable ENABLE_QUERY_TRACE to a non-empty value (e.g. "true").
| | * Added Bullet to the GemfileYorick Peterse2015-10-151-0/+6
| | | | | | | | | | | | | | | | | | This can be used to resolve N+1 query problems. Bullet is disabled by default and can be enabled by starting Rails with the environment variable ENABLE_BULLET set to a non empty value (e.g. "true").
| * | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-151-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added builds view ![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png) /cc @dzaporozhets @vsizov See merge request !1593
| | * | Fix cancel_all specsKamil Trzcinski2015-10-141-1/+1
| | | |
| | * | Added builds viewKamil Trzcinski2015-10-141-1/+5
| | | |
| * | | Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-151-1/+3
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error preventing displaying of commit data for a directory with a leading dot Directories with leading dots erroneously get rejected by the route controller if git ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller. Closes https://github.com/gitlabhq/gitlabhq/issues/8763 See merge request !1574
| | * | Fix error preventing displaying of commit data for a directory with a ↵Stan Hu2015-10-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | leading dot Closes https://github.com/gitlabhq/gitlabhq/issues/8763
| * | | Shut up, RubocopRobert Speicher2015-10-141-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add defaults for incoming_email ssl and start_tls.incoming-email-configDouwe Maan2015-10-141-4/+6
| | | |
| * | | Make Reply by email easier to configureDouwe Maan2015-10-134-41/+65
| | |/ | |/|
| * | Enable arbitration in MailRoomDouwe Maan2015-10-111-1/+11
| |/
* | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-141-1/+1
| | | | | | | | | | Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs
* | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-0/+1
|/ | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
* Use `methods: :any` in our rack-cors configurationrs-update-rack-corsRobert Speicher2015-10-071-1/+1
| | | | | This was added in rack-cors 0.4.0 and allows all types of CORS requests to the API.
* Merge branch 'clarify-postfix' into 'master' Robert Speicher2015-10-071-1/+1
|\ | | | | | | | | | | | | | | | | Clarify Reply by email settings when using Postfix mail server Fixes #2902. [ci skip] See merge request !1528
| * Clarify Reply by email settings when using Postfix mail serverclarify-postfixDouwe Maan2015-10-071-1/+1
| |
* | Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-071-22/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup CI pages - [x] Remove `ci/projects/:id` page - [x] Remove Continuous integration from project menu - [x] Remove unused css/js - [x] Remove Ci::Commit and Ci::Build controllers - [x] Move CI services to project settings area cc @ayufan Part of #2594 See merge request !1529
| * | Fix tests and few CI featuresDmitriy Zaporozhets2015-10-071-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status