- 07 Dec, 2016 7 commits
-
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
have the branch existed upfront. That is, `Rugged::Commit.create` rather than `Gitlab::Git::Blob.commit` which the former doesn't need to have the branch but the latter needs.
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
So we still commit outside the hooks, and only update ref inside the hooks. There are only two exceptions: * Whenever it's adding a tag. We can't add a tag without committing, unfortunately. See !7700 * Whenever source project is in another repository. We'll need to fetch ref otherwise commits can't be made. See the whole discussion starting from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19210942
-
-
- 06 Dec, 2016 2 commits
-
-
Lin Jen-Shin authored
Add back check if we're losing commits in a merge.
-
Lin Jen-Shin authored
-
- 05 Dec, 2016 1 commit
-
-
Lin Jen-Shin authored
git operation inside GitHooksService. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19210942 TODO: Fix tests for update_branch_with_hooks
-
- 03 Dec, 2016 2 commits
-
-
Lin Jen-Shin authored
* upstream/master: (288 commits) Added a changelog entry WIP: Adds a default commit message when adding a README (#25167) Change prop name to keep consistency with other props. Adds changelog entry Change ref property to commitRef Test all values for `enabled_git_access_protocol` Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass Simplify `branch_name` in bin/changelog Speed up project snippet security request specs Remove change to MWBS in code review guideline Enable ColorVariable in scss-lint Clean up common_utils.js (!7318) 24726 Remove Across GitLab from side navigation Remove source sans pro Use system font Update CHANGELOG.md for 8.14.2 Don't allow to specify a repo or version when installing Workhorse Fixed row margins on Pipeline Settings page in order to unify styles Fix URL rewritting in the Help section Allow public access to some Project API endpoints ...
-
Sean McGivern authored
If SSH prototol is disabled don't say the user requires SSH keys Closes #24921 See merge request !7840
-
- 02 Dec, 2016 27 commits
-
-
Jacob Schatz authored
Use system font Just for fun.... ### macOS Chrome (San Francisco):  ### macOS Safari (San Francisco):  #### Ubuntu Firefox (Ubuntu):  #### Windows 7 IE 11 (Segoe UI):  See merge request !7545
-
Rémy Coutable authored
Adds a default commit message when adding a README (#25167) Closes #25167 See merge request !7903
-
Jacob Schatz authored
Change ref property to commitRef ## What does this MR do? Changes `ref` prop to `commitRef` because `ref` is a reserved word in Vue.js ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25264 //cc @selfup See merge request !7901
-
mattl authored
-
mattl authored
-
Alfredo Sumaran authored
Clean up common_utils.js ## What does this MR do? - Remove unused functions from `common_utils.js`. - Move functions which are used from only one file to that file. ## Why was this MR needed? Because some utils weren't that common (anymore). See merge request !7318
-
Rémy Coutable authored
Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass Closes #25251 See merge request !7893
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Annabel Dunstone Gray authored
Enable ColorVariable in scss-lint ## What does this MR do? - Enable the ColorVariable rule in`.scss-lint.yml` - Change all color literals in `app/assets/stylesheets` to color variables ## Why was this MR needed? - Enforce the usage of color variables to better constrain the various color values being used ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23500 See merge request !7319
-
Annabel Dunstone Gray authored
Fixed row margins on Pipeline Settings page in order to unify styles On the ```project-name/pipelines/settings``` page, I removed the ```.row``` styling on ```.build-status``` and ```.coverage-report``` as it was causing those rows to not have the same margins as the "CI/CD Pipeline" row. Now, they are even as you can see below:   Closes #25098 cc: @filipa See merge request !7881
-
Andrew Smith authored
-
Rémy Coutable authored
Simplify `branch_name` in bin/changelog The `--short` option has existed since at least 1.8.1: https://git-scm.com/docs/git-symbolic-ref/1.8.1 See merge request !7891
-
Valery Sizov authored
-
Rémy Coutable authored
Speed up project snippet security request specs Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7813 See merge request !7890
-
Robert Speicher authored
Use gitlab-workhorse 1.1.0. Adds Prometheus support and more. See merge request !7868
-
Robert Speicher authored
The `--short` option has existed since at least 1.8.1: https://git-scm.com/docs/git-symbolic-ref/1.8.1
-
-
Rémy Coutable authored
Update API spec files to describe the correct class by changing `API::API` to the corresponding class, for example `API::AwardEmoji`. Closes #24902 See merge request !7718
-
Robert Speicher authored
Extend code review docs with chapter about the right balance [ci skip] See merge request !7838
-
Grzegorz Bizon authored
[ci skip]
-
Robert Speicher authored
Don't allow to specify a repo or version when installing Workhorse I've also updated the "patch version upgrade" doc since I did forget to update it in !6574. See merge request !7879
-
Douwe Maan authored
Pass commit data to ProcessCommitWorker This changes `ProcessCommitWorker` so that it takes a Hash containing commit data instead of a commit SHA. This means the worker doesn't have to access Git just to process a commit message (and other data it may use). This in turn should solve the problem of ending up with 15 000-something jobs in the `process_commit` queue that take forever to process. See merge request !7744
-
Douwe Maan authored
Allow public access to some Project API endpoints ## What does this MR do? This opens up a few endpoints in the Project API: - `GET /projects/visible` (returns public projects only) - `GET /projects/search/:query` (returns results only for public projects) - `GET /projects/:id` (only if the project is public) - `GET /projects/:id/events` (only if the project is public) - `GET /projects/:id/users` (only if the project is public) ## Are there points in the code the reviewer needs to double check? I've chosen to explicitly add `authenticate!` to GET methods that still need a current user. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing Part of #4269 See merge request !7843
-
Sam Rose authored
-
Alfredo Sumaran authored
Replace static fixture for notes_spec ## What does this MR do? Replace `comments.html.haml` and `issue_note.html.haml` used in `notes_spec.js` by dynamically created fixture. ## What are the relevant issue numbers? #24753 See merge request !7683
-
- 01 Dec, 2016 1 commit
-
-
Annabel Dunstone Gray authored
24726 Remove Across GitLab from side navigation ## What does this MR do? Removes Across GitLab header from side navigation ## Screenshots (if relevant) Before:  After:  ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24726 See merge request !7883
-
