summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Have sidebar labels disappear behind content instead of hide immediately.sidebar-animationDouwe Maan2015-06-252-44/+37
|
* Merge branch 'rs-random-placeholder-tip' into 'master'Dmitriy Zaporozhets2015-06-254-24/+35
|\ | | | | | | | | | | | | | | Show a random Markdown tip in the textarea placeholder cc @darby See merge request !879
| * Prefix random Markdown tips with "Tip:"rs-random-placeholder-tipRobert Speicher2015-06-242-2/+2
| |
| * Show a random Markdown tip in the textarea placeholderRobert Speicher2015-06-234-24/+35
| |
* | Merge branch 'project_icon_removal' into 'master'Dmitriy Zaporozhets2015-06-251-2/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the icons from the New Issue and New Project buttons Fixes #1869 No more icons! See merge request !885
| * | Removed the icons from the New Issue and New Project buttonsproject_icon_removalDarby2015-06-241-2/+0
| | |
* | | Merge branch 'rs-default-admin-password' into 'master'Dmitriy Zaporozhets2015-06-256-6/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default admin password Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2422 See merge request !865
| * | | Add CHANGELOG entry for default password changers-default-admin-passwordRobert Speicher2015-06-241-0/+1
| | | |
| * | | Change default admin password from "5iveL!fe" to "password"Robert Speicher2015-06-245-6/+6
| | | |
* | | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2015-06-2510-16/+33
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance improvements * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for issue or merge_request with 10 comments/participants almost twice. See merge request !883
| * | | Add CHANGELOG itemperformance-improvementsDmitriy Zaporozhets2015-06-241-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve performance for merge_request#show pageDmitriy Zaporozhets2015-06-243-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for merge_request with 10 comments/participants twice. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve performance for issue#show pageDmitriy Zaporozhets2015-06-244-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for issue with 10 comments/participants twice. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Enable rack profiler by defaultDmitriy Zaporozhets2015-06-242-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'add-2fa-status-to-admin-api' into 'master'Robert Speicher2015-06-244-2/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Add 2FA status to user admin API This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA. See merge request !881
| * | | Add 2FA status to user admin APIStan Hu2015-06-234-2/+7
| | |/ | |/| | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9391
* | | Merge branch 'master' into 'master'Stan Hu2015-06-242-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated merge request merged web hook to correctly fire action=merged. I believe this merge request will fix both issues #879 and #498. If a merge request was merged via the command line, the correct web hook was fired with the field `object_attributes.action = "merge"`. However, if the merge request was merged via the web UI, the webhook would be fired with `object_attributes.action = "open"`. See merge request !780
| * \ \ Merge branch 'master' of gitlab.com:ameily/gitlab-ce into HEADAdam Meily2015-06-240-0/+0
| |\ \ \
| | * | | Updated merge request merged web hook to correctly fire action=merged.Adam Meily2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #879 Fixes #498
| * | | | Added CHANGELOG message for fixing MR webhookAdam Meily2015-06-241-0/+1
| | | | |
| * | | | Updated merge request merged web hook to correctly fire action=merged.Adam Meily2015-06-241-1/+1
|/ / / / | | | | | | | | | | | | | | | | Fixes #879 Fixes #498
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-243-2/+9
|\ \ \ \
| * \ \ \ Merge branch 'explicit_error_ci' into 'master'Dmitriy Zaporozhets2015-06-243-2/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicit error when commit not found in the GitLab CI !!! SHOULD BE MERGED WITH https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/159 https://dev.gitlab.org/gitlab/gitlab-ci/issues/280 See merge request !871
| | * | | | update changelogexplicit_error_ciValery Sizov2015-06-231-0/+1
| | | | | |
| | * | | | Explicit error when commit not found in the GitLab CIValery Sizov2015-06-232-2/+8
| | | | | |
* | | | | | Merge branch 'stop-jumping' into 'master'Dmitriy Zaporozhets2015-06-241-5/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop jumping all content on collapsing and expanding the sidebar When you collapse or expand the sidebar, all content shifts with 5px. This merge request solves that. cc @darby See merge request !1877
| * | | | | stop jumping all content on collapsing and expanding the sidebarJob van der Voort2015-06-241-5/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-243-20/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'rs-issue-1850' into 'master'Douwe Maan2015-06-243-20/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only look up Commit authors/committers by email - Removes looking up authors/committers by name - Renames `User.find_for_commit` to `User.find_by_any_email` Closes #1850 See merge request !878
| | * | | | Only look up Commit authors/committers by emailrs-issue-1850Robert Speicher2015-06-233-20/+10
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | - Removes looking up authors/committers by name - Renames `User.find_for_commit` to `User.find_by_any_email`
* | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-244-54/+63
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'application_settings_form' into 'master'Dmitriy Zaporozhets2015-06-243-53/+60
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the categories of Application Settings Form Changed the categories and order of the application settings accessible by admin/application_settings Link to issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2412 Issue will be closed upon approval of this merge request. Fixes #2412 See merge request !877
| | * | | | Changed the placement of Restricted Domainsapplication_settings_formDarby2015-06-231-6/+8
| | | | | |
| | * | | | Updated the categories of Application Settings FormDarby2015-06-233-54/+59
| | |/ / /
| * | | | Merge branch 'rs-dev-issue-2419' into 'master'Dmitriy Zaporozhets2015-06-241-1/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow user to remove public email address Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2419 See merge request !880
| | * | | Allow user to remove public email addressrs-dev-issue-2419Robert Speicher2015-06-231-1/+3
| |/ / /
* | | | Merge branch 'create_ssh' into 'master'Job van der Voort2015-06-232-1/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create SSH keys document @job I created the next document for your review, which is "Creating your SSH Keys" Thanks! See merge request !1875
| * | | | added final phrase in dockaren Carias2015-06-231-0/+1
| | | | |
| * | | | added requested changeskaren Carias2015-06-231-11/+0
| | | | |
| * | | | added images to dockaren Carias2015-06-221-9/+9
| | | | |
| * | | | added new file about creating your SSH keyskaren Carias2015-06-222-1/+48
| | | | |
* | | | | Merge branch 'k-link-basicdocs' into 'master'Job van der Voort2015-06-231-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | added link to GitLab Basics Added link to GitLab Basics See merge request !1876
| * | | | added link to GitLab Basicskaren Carias2015-06-231-0/+1
| | | | |
* | | | | Merge branch 'fix-readme-avatar' into 'master'Dmitriy Zaporozhets2015-06-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert README avatar to original version In my attempt to rid the world of `gitlab_logo.png`, I didn't realize that http://about.gitlab.com was hosted somewhere else and hence the original link worked fine. See merge request !876
| * | | | Revert avatar URL to original versionStan Hu2015-06-231-1/+1
|/ / / /
* | | | Merge branch 'split-tests' into 'master'Dmitriy Zaporozhets2015-06-2323-73/+91
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split rspec and spinach tests in parallel For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386 See merge request !874
| * | | | Replace GITLAB with GitLab in rake task descriptionsDmitriy Zaporozhets2015-06-2319-37/+37
| | | | |
| * | | | Refactor rake tasks for testsDmitriy Zaporozhets2015-06-233-29/+25
| | | | |
| * | | | Split rspec and spinach tests in parallelDmitriy Zaporozhets2015-06-231-7/+29
| | | | |
* | | | | Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-236-3/+47
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix downloading of patches on public merge requests when user logged out ### What does this MR do? This MR makes it possible to download a diff patch on a public merge request when a user is logged out. ### Why was this MR needed? An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button: ``` NoMethodError - undefined method `id' for nil:NilClass: lib/gitlab/backend/shell_env.rb:9:in `set_env' lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite' lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite' app/models/merge_request.rb:219:in `to_diff' app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show' ``` ### What are the relevant issue numbers? * Closes #1225 * Closes #1854 (dup) * Closes #1858 (dup) See merge request !872
View Lorry Controller Status