summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Optimize creation of commit API by using Repository#commit instead of ↵sh-optimize-project-commit-apiStan Hu2017-07-032-1/+5
| | | | | | | | | Repository#commits Repository#commits is expensive because it has to use Rugged to walk the Git tree as opposed to doing a direct ref lookup. Improves performance in #34533
* Update CHANGELOG.md for 9.3.4James Edwards-Jones2017-07-031-0/+4
| | | [ci skip]
* Merge branch 'jej-update-gitlab-shell-to-5-1-1' into 'master'James Edwards-Jones2017-07-031-1/+1
|\ | | | | | | | | Update GITLAB_SHELL_VERSION to 5.1.1 See merge request !12615
| * Update GITLAB_SHELL_VERSION to 5.1.1jej-update-gitlab-shell-to-5-1-1James Edwards-Jones2017-07-031-1/+1
| | | | | | | | | | Update to >= 5.1.0 needed for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2240 on EE. Updated here to keep CE and EE on the same version. 5.1.1 includes https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/142 to revert changes which were causing problems with Post Receive hooks.
* | Merge branch 'autosize-js-perf' into 'master'Clement Ho2017-07-031-19/+4
|\ \ | | | | | | | | | | | | Make autosize fields more performant and remove broken autosize handle See merge request !12532
| * | Make autosize fields more performant and remove broken autosize handleBryce Johnson2017-07-031-19/+4
|/ /
* | Merge branch 'sh-allow-force-repo-create' into 'master'Sean McGivern2017-07-033-11/+28
|\ \ | | | | | | | | | | | | | | | | | | Make Project#ensure_repository force create a repo Closes gitlab-ee#2800 See merge request !12580
| * | Change the force flag to a keyword argumentsh-allow-force-repo-createDouglas Barbosa Alexandre2017-07-032-3/+3
| | |
| * | Make Project#ensure_repository force create a repoStan Hu2017-06-303-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | In Geo, Project#ensure_repository is used to make sure that a Git repo is available to be fetched on a secondary. If a project were a fork, this directory would never be created. Closes gitlab-org/gitlab-ee#2800
* | | Merge branch 'add-ci_variables-environment_scope' into 'master'Kamil Trzciński2017-07-039-5/+164
|\ \ \ | | | | | | | | | | | | | | | | Add environment_scope column to ci_variables table See merge request !12363
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵add-ci_variables-environment_scopeLin Jen-Shin2017-07-04194-1086/+2900
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ci_variables-environment_scope * upstream/master: (79 commits) Reset @full_path to nil when cache expires add margin between captcha and register button Eagerly create a milestone that is used in a feature spec Adjust readme repo width Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Fix curl example paths (missing the 'files' segment) Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Remove placeholder note when award emoji slash command is applied Make setSidebarHeight more efficient with SidebarHeightManager. Update CHANGELOG.md for 9.3.3 Resolve "More actions dropdown hidden by end of diff" Use Gitaly 0.14.0 Improve support for external issue references Make issuables_count_for_state public ...
| * | | | We no longer test the presence of the keyLin Jen-Shin2017-06-291-1/+0
| | | | |
| * | | | Only indent if the subsequent line is a subqueryLin Jen-Shin2017-06-291-12/+12
| | | | |
| * | | | Update changelog entry to reflect that we're renamingLin Jen-Shin2017-06-291-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-06-29433-6129/+15679
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ci_variables-environment_scope * upstream/master: (192 commits) Minor edits Job details won't scroll horizontally to show long lines Bring back branches badge to main project page Inserts exact matches of username, email and name to the top of the user search list Limit OpenGraph image size to 64x64 Improve changelog Split up MergeRequestsController Add parent_id back to the tests Make changelog more descriptive Update README.md to reflect where "Secret variables" are located Improve tests text Rename members_count to members_count_with_descendants and expose only to group admins Fix a bug where an invalid sort param value was passed to Gitaly Drop default ORDER scope when calling a find method on a Sortable model Add tests for project import state transition: [:started] => [:finished] Add CHANGELOG Perform housekeeping only when an import of a fresh project is completed Strip trailing whitespace in relative submodule URL Adjust projects spec on namespace fields Add "members_count" and "parent_id" data on namespaces API ...
| * | | | | Better indent the SQLadd-ci_variables-environment_scope-mysqlLin Jen-Shin2017-06-271-7/+10
| | | | | |
| * | | | | Rename the migration test to match the migration pathLin Jen-Shin2017-06-271-0/+0
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-06-27552-3882/+8360
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ci_variables-environment_scope * upstream/master: (226 commits) Polish sidebar toggle Add changelog entry Fix optional args for POST :id/variables Update CHANGELOG.md for 9.3.1 Bump bootsnap to 1.1.1 Add explicit message when no runners on admin Fix endpoint not being update correctly Remove unused Gitlab::Git::Commit#to_diff argument Drop GFM support for the title of Milestone/MergeRequest in template Handle Promise rejections in mr_widget_pipeline_spec.js Handle missing pipeline in merge request widget Store merge request ref_fetched status in the database Tag a spec as :nested_groups since it fails on MySQL Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval of assets Truncate long job names in environment view; wrap author to next line Replaces 'dashboard/merge_requests' spinach with rspec Update GITLAB_SHELL_VERSION to 5.0.6 Fix click not being able to find the current element to use trigger('click') instead make accepting mrs more prominent Remove last references to job for pipeline charts ...
| * | | | | | Rename instead of delete, feedback:Lin Jen-Shin2017-06-273-48/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12363#note_33449374
| * | | | | | Add back project_id index for MySQL if revertingLin Jen-Shin2017-06-231-2/+7
| | | | | | |
| * | | | | | Remove old project_id index and make sure mysql workLin Jen-Shin2017-06-233-5/+34
| | | | | | |
| * | | | | | We cannot delete the index for MySQL, because fkLin Jen-Shin2017-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | foreign key, I mean.
| * | | | | | Add changelog entryLin Jen-Shin2017-06-231-0/+6
| | | | | | |
| * | | | | | Remove duplicated records and add unique constraintLin Jen-Shin2017-06-225-2/+95
| | | | | | |
| * | | | | | Add environment_scope column to ci_variables tableLin Jen-Shin2017-06-214-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is merely to make CE and EE more compatible. See the EE merge request at: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
* | | | | | | Merge branch ↵Grzegorz Bizon2017-07-032-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32885-unintentionally-removing-branch-when-merging-merge-request' into 'master' Set default for "Remove source branch" to false Closes #32885 See merge request !12576
| * | | | | | | Set force_remove_source_branch default to false.32885-unintentionally-removing-branch-when-merging-merge-requestBryce Johnson2017-07-022-2/+5
| | | | | | | |
* | | | | | | | Merge branch 'sh-optimize-project-creation' into 'master'Rémy Coutable2017-07-033-27/+142
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up operations performed by gitlab-shell See merge request !12597
| * | | | | | | | Speed up operations performed by gitlab-shellStan Hu2017-07-033-27/+142
|/ / / / / / / /
* | | | | | | | Merge branch '32048-shared-runners-admin-buttons-have-odd-spacing' into 'master'Clement Ho2017-07-033-7/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Shared runners admin buttons have odd spacing" Closes #32048 See merge request !12535
| * | | | | | | | Replace existing runner links with icons and tooltips, move into btn-group.32048-shared-runners-admin-buttons-have-odd-spacingBryce Johnson2017-07-033-7/+31
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/overview-features-2' into 'master'Achilleas Pipinellis2017-07-033-10/+62
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add overview and use-cases to Issue Boards doc See merge request !12543
| * | | | | | | | add image - issue boards - moving cardMarcia Ramos2017-07-031-0/+0
| | | | | | | | |
| * | | | | | | | copyedit == ee !2296Marcia Ramos2017-07-031-23/+49
| | | | | | | | |
| * | | | | | | | fix spellingdocs/overview-features-2Marcia Ramos2017-06-291-2/+2
| | | | | | | | |
| * | | | | | | | Axil's reviewMarcia Ramos2017-06-291-3/+3
| | | | | | | | |
| * | | | | | | | explain that use-cases are just examplesMarcia Ramos2017-06-281-0/+3
| | | | | | | | |
| * | | | | | | | copyeditMarcia Ramos2017-06-281-1/+1
| | | | | | | | |
| * | | | | | | | remove multiple IB partMarcia Ramos2017-06-281-13/+0
| | | | | | | | |
| * | | | | | | | capitalize feature name, add overview and use cases w/ multiple boards (EE)Marcia Ramos2017-06-281-3/+39
| | | | | | | | |
| * | | | | | | | improve site search for "issues"Marcia Ramos2017-06-281-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-2801' into 'master'Sean McGivern2017-07-037-2/+37
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expires full_path cache after a repository is renamed/transferred Closes gitlab-ee#2801 See merge request !12575
| * | | | | | | | Reset @full_path to nil when cache expiresDouglas Barbosa Alexandre2017-07-032-3/+5
| | | | | | | | |
| * | | | | | | | Add CHANGELOGfix-2801Douglas Barbosa Alexandre2017-06-291-0/+4
| | | | | | | | |
| * | | | | | | | Expires full_path cache after repository is transferredDouglas Barbosa Alexandre2017-06-292-0/+7
| | | | | | | | |
| * | | | | | | | Expires full_path cache after project is renamedDouglas Barbosa Alexandre2017-06-294-2/+24
| | | | | | | | |
* | | | | | | | | Merge branch '29000-recaptcha-margin' into 'master'Filipa Lacerda2017-07-031-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add margin between captcha and register button Closes #29000 See merge request !12607
| * | | | | | | | add margin between captcha and register button29000-recaptcha-marginSimon Knox2017-07-031-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-031-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo in gitlab_flow.md See merge request !12561
| * | | | | | | | | Fixed typo in gitlab_flow.mdleungpeng2017-06-291-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |