Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-token | Eric Eastwood | 2017-12-07 | 1 | -4/+3 |
| | |||||
* | issue note store | Simon Knox | 2017-11-30 | 1 | -1/+1 |
| | |||||
* | Merge branch '40642-members-tab-not-signed-in' into 'master' | Mike Greiling | 2017-11-30 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Add project_members controller when not signed in Closes #40642 See merge request gitlab-org/gitlab-ce!15659 | ||||
| * | Add project_members controller when not signed in40642-members-tab-not-signed-in | Annabel Dunstone Gray | 2017-11-29 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '13634-broadcast-message' into 'master' | Tim Zallmann | 2017-11-30 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix broadcast message not showing up on login page Closes #13634 See merge request gitlab-org/gitlab-ce!15578 | ||||
| * | | Fix broadcast message not showing up on login page | Kushal Pandya | 2017-11-28 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master' | Grzegorz Bizon | 2017-11-30 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector. See merge request gitlab-org/gitlab-ce!15515 | ||||
| * | | | Aling shared_exmaples to "same behavior between KubernetesService and ↵ | Shinya Maeda | 2017-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Platform::Kubernetes" | ||||
| * | | | Replce kubernetes_service and deployment_service to deployment_platform | Shinya Maeda | 2017-11-28 | 3 | -3/+3 |
| |/ / | |||||
* | | | Merge branch '39455-clone-dropdown-should-not-have-a-tooltip' into 'master' | Tim Zallmann | 2017-11-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clone dropdown should not have a tooltip" Closes #39455 See merge request gitlab-org/gitlab-ce!15334 | ||||
| * | | | Change dropdown button background color | Jose Ivan Vargas | 2017-11-27 | 1 | -1/+1 |
| |/ / | |||||
* | | | Remove blank flash messages caused by nil40671-fix-empty-blank-flash-messages | Eric Eastwood | 2017-11-29 | 1 | -3/+5 |
| |/ |/| | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40671 See https://gitlab.com/gitlab-org/gitlab-ce/blob/f7254a4060b30e3134c6cf932eaba0fc8e249e9a/app/controllers/sessions_controller.rb#L42 for an example of where we set `flash[:notice] = nil` | ||||
* | | Merge branch 'bvl-double-fork' into 'master' | Phil Hughes | 2017-11-29 | 2 | -16/+27 |
|\ \ | | | | | | | | | | | | | Redirect to an already forked project if it exists See merge request gitlab-org/gitlab-ce!15653 | ||||
| * | | Redirect to an already forked project if it exists | Bob Van Landuyt | 2017-11-29 | 2 | -16/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | Before the we would try to `POST` to the project path, which would result in a 404, because that `POST` is not supported. By changing this back to a normal link, not not handled in JS, we can immeadiatly redirect. | ||||
* | | | Merge branch 'multi-file-editor-css-fixes' into 'master' | Tim Zallmann | 2017-11-29 | 2 | -1/+2 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Added IDE commit panel Closes #40041 See merge request gitlab-org/gitlab-ce!15583 | ||||
| * | | Added IDE commit panel | Phil Hughes | 2017-11-24 | 2 | -1/+2 |
| |/ | | | | | | | Closes #40041 | ||||
* | | Merge branch 'events-atom-feed-author-query' into 'master' | Douwe Maan | 2017-11-29 | 1 | -1/+6 |
|\ \ | | | | | | | | | | | | | Reuse authors when rendering event Atom feeds See merge request gitlab-org/gitlab-ce!15630 | ||||
| * | | Reuse authors when rendering event Atom feedsevents-atom-feed-author-query | Yorick Peterse | 2017-11-28 | 1 | -1/+6 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | Previously we'd use "event.author_email" which translates to "event.author.email". This would result in an extra query being executed _for every event_ just to get the same author's Email address. Instead of doing all this useless work we can just pass the User object returned by "event.author" since: 1. This allows us to re-use the user object's Email address. 2. Authors are eager-loaded, so this doesn't cause any N+1 queries. | ||||
* | | Merge branch ↵ | Sean McGivern | 2017-11-29 | 1 | -22/+38 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '21143-customize-branch-name-when-using-create-branch-in-an-issue' into 'master' Resolve "Customize branch name when using create branch in an issue" Closes #21143 See merge request gitlab-org/gitlab-ce!13884 | ||||
| * | | Add an ability to use a custom branch name on creation from issues | Vitaliy @blackst0ne Klachkov | 2017-11-25 | 1 | -22/+38 |
| | | | |||||
* | | | Add timeouts for Gitaly calls | Andrew Newdigate | 2017-11-29 | 1 | -0/+24 |
| | | | |||||
* | | | Merge branch ↵ | Kamil Trzciński | 2017-11-28 | 2 | -16/+22 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings' into 'master' Add checkbox to automatically run a pipeline when Auto DevOps is turned on in project settings Closes #38962 See merge request gitlab-org/gitlab-ce!15380 | ||||
| * | | | Add checkboxes to automatically run AutoDevops pipeline | Eric Eastwood | 2017-11-28 | 2 | -16/+22 |
| | |/ | |/| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962 | ||||
* | | | Merge branch '40459-svg-icon-fix' into 'master' | Annabel Dunstone Gray | 2017-11-28 | 2 | -3/+3 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Resolve "Issue note icons wrong color" Closes #40459 See merge request gitlab-org/gitlab-ce!15561 | ||||
| * | | override a:focus styles. fix Commit page pipeline icon40459-svg-icon-fix | Simon Knox | 2017-11-23 | 1 | -2/+2 |
| | | | |||||
| * | | fix some icon colors. move text-color styles to common.scss | Simon Knox | 2017-11-23 | 1 | -1/+1 |
| | | | |||||
* | | | Prevent 500 error when inspecting job after trigger was removed | Filipa Lacerda | 2017-11-24 | 1 | -3/+4 |
| | | | |||||
* | | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master' | Douwe Maan | 2017-11-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move identical merged branch check to merged_branch_names Closes #39887 See merge request gitlab-org/gitlab-ce!15464 | ||||
| * | | | Move identical merged branch check to merged_branch_names | Lin Jen-Shin | 2017-11-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Allow password authentication to be disabled entirely | Markus Koller | 2017-11-23 | 9 | -16/+29 |
| | | | | |||||
* | | | | Improve environments performance | Filipa Lacerda | 2017-11-23 | 2 | -4/+4 |
|/ / / | |||||
* | | | Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' ↵ | Filipa Lacerda | 2017-11-23 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Hide `section_start` and `section_end` in pipeline emails" Closes #39653 See merge request gitlab-org/gitlab-ce!15534 | ||||
| * | | | Add CSS hidden class in mailer layout39653-hide-section_start-and-section_end-in-pipeline-emails | Alessio Caiazza | 2017-11-22 | 1 | -0/+4 |
| | | | | |||||
* | | | | Change star, filter and settings icons to the their sprite based replacements | Jose Ivan Vargas Lopez | 2017-11-23 | 2 | -4/+4 |
| | | | | |||||
* | | | | Add edit button to mobile file view | Travis Miller | 2017-11-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'group-new-miletone-breadcrumb' into 'master' | Filipa Lacerda | 2017-11-22 | 1 | -1/+0 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Fixed new group milestone breadcrumb Closes #40338 See merge request gitlab-org/gitlab-ce!15511 | ||||
| * | | | Fixed new group milestone breadcrumb | Phil Hughes | 2017-11-22 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | Closes #40338 | ||||
* | | | | Merge branch '39720-group-milestone-sorting' into 'master' | Sean McGivern | 2017-11-22 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Add Group Milestone sorting Closes #39720 See merge request gitlab-org/gitlab-ce!15230 | ||||
| * | | | Add group milestone to feature spec and minor changes | George Andrinopoulos | 2017-11-07 | 2 | -23/+1 |
| | | | | |||||
| * | | | Add Group Milestone sorting | George Andrinopoulos | 2017-11-07 | 2 | -0/+23 |
| | | | | |||||
* | | | | Set the default gitlab-shell timeout to 3 hours | Nick Thomas | 2017-11-21 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch '40377-blank-states' into 'master' | Annabel Dunstone Gray | 2017-11-21 | 1 | -8/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix blank states using old css Closes #40377 See merge request gitlab-org/gitlab-ce!15521 | ||||
| * | | | | Fix blank states using old css40377-blank-states | Filipa Lacerda | 2017-11-21 | 1 | -8/+9 |
| | | | | | |||||
* | | | | | Merge branch 'dz-improve-help-page' into 'master' | Annabel Dunstone Gray | 2017-11-21 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Add wiki css to help page See merge request gitlab-org/gitlab-ce!15488 | ||||
| * | | | | Add wiki css to help page | Dmitriy Zaporozhets | 2017-11-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Use the correct i18n helper for namespaced string40367-tagspage-tags | Rémy Coutable | 2017-11-21 | 1 | -1/+1 |
| |_|/ / |/| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master' | Phil Hughes | 2017-11-21 | 1 | -0/+2 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Fix commits list 500 with multi-file editor new_repo cookie Closes #39821 See merge request gitlab-org/gitlab-ce!15502 | ||||
| * | | | Fix commits list 500 with multi-file editor new_repo cookie39821-fix-commits-list-with-multi-file-editor | Eric Eastwood | 2017-11-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39821 /<namespace>/<project>/commmits/master | ||||
* | | | | Merge branch '39497-inline-edit-issue-on-mobile' into 'master' | Annabel Dunstone Gray | 2017-11-20 | 2 | -15/+13 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add inline editing to issues on mobile Closes #39497 See merge request gitlab-org/gitlab-ce!15438 | ||||
| * | | | | Add inline editing to issues on mobile | Eric Eastwood | 2017-11-18 | 2 | -15/+13 |
| | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497 |