Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix offline_token http_status code | Kamil Trzcinski | 2016-05-15 | 1 | -1/+1 |
| | |||||
* | Fix http status codes for container registry authentication service | Kamil Trzcinski | 2016-05-15 | 1 | -2/+2 |
| | |||||
* | Improve authentication service specs | Kamil Trzcinski | 2016-05-15 | 1 | -3/+3 |
| | |||||
* | Rename JWT to JSONWebToken | Kamil Trzcinski | 2016-05-14 | 1 | -16/+11 |
| | |||||
* | Fix authentication service | Kamil Trzcinski | 2016-05-14 | 1 | -1/+7 |
| | |||||
* | Use Auth::ContainerRegistryAuthenticationService | Kamil Trzcinski | 2016-05-14 | 2 | -71/+69 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-13 | 4 | -4/+8 |
|\ | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb | ||||
| * | Codestyle: make sure we have space around operators | Gabriel Mazetto | 2016-05-13 | 2 | -2/+2 |
| | | |||||
| * | Improve log message when a project is destroyed to include the namespace | Stan Hu | 2016-05-10 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'escape-commit-titles' into 'master' | Robert Speicher | 2016-05-08 | 1 | -1/+5 |
| |\ | | | | | | | | | | | | | | | | | | | Escape HTML in commit titles in system note messages Closes #17348 See merge request !4084 | ||||
| | * | Escape HTML in commit titles in system note messages | Stan Hu | 2016-05-07 | 1 | -1/+5 |
| | | | | | | | | | | | | Closes #17348 | ||||
* | | | Move JWT to Gitlab::JWT | Kamil Trzcinski | 2016-05-13 | 1 | -50/+52 |
| | | | |||||
* | | | Fix CI tests | Kamil Trzcinski | 2016-05-12 | 1 | -3/+3 |
| | | | |||||
* | | | Rename DockerAuthenticationService to ContainerRegistryAuthenticationService | Kamil Trzcinski | 2016-05-09 | 1 | -9/+13 |
| | | | |||||
* | | | Make code more clear in what is done | Kamil Trzcinski | 2016-05-09 | 1 | -9/+9 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-09 | 9 | -49/+74 |
|\ \ \ | |/ / | |||||
| * | | Reduce delay in destroying a project from 1-minute to immediately | Stan Hu | 2016-05-07 | 1 | -3/+1 |
| |/ | | | | | | | Run ProjectDestroyWorker after pending_delete attribute has been committed to DB | ||||
| * | Merge branch '14564-mr-automatic-title' into 'master' | Douwe Maan | 2016-05-06 | 1 | -6/+30 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-set title for branches created from issues This sets the title for a new MR to 'Resolves "$issue-title"' when: - The source branch for the MR begins with a value iid. - The MR has more than one commit in its diff (if there's one commit, keep using the commit's first line). - The iid does not point to a confidential issue. Single commit:  Multiple commits:  Confidential issue:  cc @DouweM @zj Closes #14564 See merge request !3966 | ||||
| | * | Don't auto-set MR title for confidential issues | Sean McGivern | 2016-05-06 | 1 | -1/+1 |
| | | | |||||
| | * | Auto-set title for branches created from issues | Sean McGivern | 2016-05-06 | 1 | -6/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a branch starts with an issue's IID, followed by a hyphen, the description will be updated to say that is closes the issue. This also updates the title of the merge request to 'Resolves "$issue-title"', as long as: - There is more than one commit in the merge request (if there is only one commit, the commit's title will be used as before) - The issue's IID is valid for the project | ||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Long Nguyen | 2016-05-05 | 7 | -38/+39 |
| |\ \ | | |/ | | | | | | | issue_14532_assign_labels_milestone_when_moving_issue | ||||
| | * | Expire repository exists? and has_visible_content? caches after a push if ↵ | Stan Hu | 2016-05-04 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | necessary Closes #17012 | ||||
| | * | Use a similar approach to branch creation for tag creationuse-rugged-to-create-tag | Rémy Coutable | 2016-05-04 | 2 | -36/+15 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | Use Rugged's TagCollection#create instead of gitlab-shell's ↵ | Rémy Coutable | 2016-05-04 | 1 | -21/+17 |
| | | | | | | | | | | | | | | | | | | Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-05-02 | 2 | -0/+14 |
| | |\ | |||||
| | | * | Prevent privilege escalation via notes API | Robert Speicher | 2016-04-26 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577 | ||||
| | | * | Prevent private project name and namespace from leaking in the new MR view | Rémy Coutable | 2016-04-25 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15591. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Fix error when trying to create a wiki page | Rémy Coutable | 2016-04-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #15527. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Update changelog, improve specs | Long Nguyen | 2016-05-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Code refactor and fix broken spec | Long Nguyen | 2016-04-28 | 1 | -3/+5 |
| | | | | |||||
| * | | | Allow to assign labels and milestone to target project when moving issue | Long Nguyen | 2016-04-26 | 1 | -1/+10 |
| | |/ | |/| | |||||
* | | | Split docker authentication service | Kamil Trzcinski | 2016-05-02 | 1 | -0/+65 |
| |/ |/| | |||||
* | | Support supressing text file diffs on the default branch with .gitattributes | Matt Oakes | 2016-04-29 | 1 | -0/+9 |
|/ | | | | | | | | This is a combination of 3 commits. - Update the bare repositories info/attributes if the default branch is updated - Check the diff attributes of a file before showing a diff - Update CHANGELOG | ||||
* | Fix Error 500 due to stale cache when projects are renamed or transferred | Stan Hu | 2016-04-25 | 1 | -0/+2 |
| | | | | Closes gitlab-org/gitlab-ee#506 | ||||
* | Use association search in issuable create service | Grzegorz Bizon | 2016-04-22 | 1 | -6/+6 |
| | |||||
* | Verify label affiliation before assigning to issue | Grzegorz Bizon | 2016-04-22 | 1 | -2/+26 |
| | | | | | | | This also verify if milestone belongs to correct project before creating a new issue. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439 | ||||
* | Merge branch 'ci-commit-as-pipeline' into 'master' | Kamil Trzciński | 2016-04-21 | 4 | -20/+32 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653 | ||||
| * | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline | Kamil Trzcinski | 2016-04-19 | 3 | -20/+27 |
| |\ | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * \ | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline | Kamil Trzcinski | 2016-04-16 | 7 | -28/+43 |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * \ \ | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline | Kamil Trzcinski | 2016-04-13 | 2 | -24/+36 |
| |\ \ \ | |||||
| * | | | | Fix rest of rspec and spinach tests | Kamil Trzcinski | 2016-04-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix specs | Kamil Trzcinski | 2016-04-11 | 4 | -8/+10 |
| | | | | | |||||
| * | | | | Use Ci::Commit as Pipeline | Kamil Trzcinski | 2016-04-11 | 3 | -14/+24 |
| | | | | | |||||
* | | | | | Fix wiki tests | Sebastian Klier | 2016-04-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | add wiki_page helper to url_builder | Sebastian Klier | 2016-04-20 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | add slack notifications for wiki pages | Sebastian Klier | 2016-04-20 | 3 | -0/+50 |
| | | | | | | | | | | | | | | | | | | | | update changelog | ||||
* | | | | | Merge branch 'pmq20/gitlab-ce-issue_12785' | Douwe Maan | 2016-04-19 | 3 | -43/+69 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Add support to cherry-pick any commit | P.S.V.R | 2016-04-18 | 3 | -43/+69 |
| | |_|/ | |/| | | | | | | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514 | ||||
* | | | | Using single builder for push and tag events | Gabriel Mazetto | 2016-04-19 | 2 | -2/+2 |
| | | | | |||||
* | | | | Refactor GitTagPushService and fig tags_push system event hook | Gabriel Mazetto | 2016-04-19 | 1 | -14/+13 |
| | | | |