summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-063-9/+6
| | | | | | | | Removing those weird setup in assign_change_commit_vars fixed all the failures in the tests. I still cannot say why but clearly we need to have better names. It's so confusing right now. We should seriously stop fiddling those instance variables.
* Prefer leading dots over trailing dotsLin Jen-Shin2017-01-052-6/+6
|
* Merge request terms are reversed for GitOperationServiceLin Jen-Shin2017-01-051-4/+4
| | | | | | | | | | | This is seriously confusing but a target branch in merge request, is actually the source branch for GitOperationService, which is the base branch. The source branch in a merge request, is the target branch for GitOperationService, which is where we want to make commits. Perhaps we should rename source branch in GitOperationService to base branch, and target branch to committing branch.
* I think I am really confused, should be @tree_edit_projectLin Jen-Shin2017-01-051-1/+1
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20571990
* Remove tag with git hooksLin Jen-Shin2017-01-053-10/+23
|
* Introduce Repository#with_repo_branch_commitLin Jen-Shin2017-01-053-33/+28
| | | | | | | | | We merge repository checks inside it so we don't have to check it on the call site, and we could also load the commit for the caller. This greatly reduce code duplication. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20572919
* Indent the way rubocop likesLin Jen-Shin2017-01-053-5/+5
|
* Update the comment:Lin Jen-Shin2017-01-041-3/+5
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20876648
* Prefer leading dots over trailing dotsLin Jen-Shin2017-01-041-2/+2
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20601323
* Add a comment to explain why newrev should be updatedLin Jen-Shin2017-01-041-1/+3
| | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20301332
* Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-04733-3747/+6935
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1031 commits) Add changelog entry for renaming API param [ci skip] Add missing milestone parameter Refactor issues filter in API Fix project hooks params Gitlab::LDAP::Person uses LDAP attributes configuration Don't delete files from spec/fixtures Copy, don't move uploaded avatar files Minor improvements to changelog docs Rename logo, apply for Slack too Fix Gemfile.lock for the octokit update Fix cross-project references copy to include the project reference Add logo in public files Use stable icon for Mattermost integration rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) API: extern_uid is a string Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Removed bottom padding from merge manually from CLI because of repositioning award emoji's Make haml_lint happy Improve spec Add feature tests for Cycle Analytics ...
| * Merge branch '25580-trucate-dropdown-for-long-branch' into 'master' Fatih Acet2017-01-033-8/+38
| |\ | | | | | | | | | | | | | | | | | | Resolves overflow of dropdown text for long branch name Closes #25580 See merge request !8118
| | * fixes js lint warnings25580-trucate-dropdown-for-long-branchNur Rony2016-12-311-4/+3
| | |
| | * trucates text to prevent overflow and adds tooltip to itNur Rony2016-12-312-4/+12
| | |
| | * fixes mobile viewsNur Rony2016-12-311-4/+27
| | |
| * | Merge branch ↵Fatih Acet2017-01-032-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version' into 'master' Resolve changing "from" version in diff comparison does not preserve "to" version Closes #25836 See merge request !8328
| | * | Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-312-2/+3
| | |/
| * | Merge branch '25964-label-autocomplete-doesn-t-handle-spaces-after' into ↵Fatih Acet2017-01-031-8/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Label autocomplete doesn't handle spaces after `~~`" Closes #25964, #22058, and #23578 See merge request !8254
| | * | Remove unneeded prevention code25964-label-autocomplete-doesn-t-handle-spaces-afterLuke "Jared" Bennett2016-12-271-8/+1
| | | |
| | * | Fixes #22058 and #23578Yann Gravrand2016-12-271-1/+3
| | | |
| * | | Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into ↵Fatih Acet2017-01-033-5/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Disable award emoji button but display tooltip Closes #26168 See merge request !8382
| | * | | Disable award emoji button but display tooltip26168-emoji-reactions-missing-tooltip-when-not-logged-inSam Rose2016-12-313-5/+18
| | | |/ | | |/|
| * | | Merge branch 'additional-award-emoji-repositioning-fixes' into 'master' Annabel Dunstone Gray2017-01-031-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Removed bottom padding from merge manually from CLI because of repositioning award emoji's See merge request !8398
| | * | | Removed bottom padding from merge manually from CLI because of repositioning ↵additional-award-emoji-repositioning-fixesdimitrieh2017-01-021-1/+1
| | |/ / | | | | | | | | | | | | award emoji's
| * | | Merge branch 'regression-note-headline-light' into 'master' Annabel Dunstone Gray2017-01-031-2/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fixed regression of note-headline-light where it was always placed on 2 lines, e… See merge request !8348
| | * | | Fixed regression of note-headline-light where it was always placed on 2 ↵regression-note-headline-lightdimitrieh2016-12-301-2/+10
| | | | | | | | | | | | | | | | | | | | lines, even on wide viewports
| * | | | Merge branch 'use-stable-icon-url' into 'master' Kamil Trzciński2017-01-032-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use stable icon for Mattermost integration See merge request !8252
| | * | | | Rename logo, apply for Slack tooZ.J. van de Weg2017-01-032-2/+2
| | | | | |
| | * | | | Add logo in public filesZ.J. van de Weg2017-01-031-1/+1
| | | | | |
| | * | | | Use stable icon for Mattermost integrationKamil Trzcinski2017-01-031-1/+1
| | | | | |
| * | | | | Merge branch 'project-avatar-fork' into 'master' Sean McGivern2017-01-031-0/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy, don't move uploaded avatar files Closes #26158 See merge request !8396
| | * | | | | Copy, don't move uploaded avatar filesJacob Vosmaer2017-01-031-0/+11
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'fix/cross-project-ref-path' into 'master' Sean McGivern2017-01-0315-53/+49
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project references copy to include the project reference Closes #25890 See merge request !8232
| | * | | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-0315-53/+49
| | | |/ / / | | |/| | | | | | | | | | | | | | | Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
| * | | | | Merge branch 'fix-double-line-issuable-page' into 'master' Annabel Dunstone Gray2017-01-031-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bottom border from Issuable titles See merge request !8278
| | * | | | | Remove bottom border from issuable titlesfix-double-line-issuable-pageAlfredo Sumaran2016-12-301-0/+6
| | | | | | |
| * | | | | | Merge branch 'minor-ruby-status-badge-changes' into 'master' Sean McGivern2017-01-031-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) See merge request !8409
| | * | | | | | rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?)dimitrieh2017-01-031-3/+3
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'add-tests-to-cycle-analytics' into 'master' 26257-tooltip-hidden-pipeline-dropdownSean McGivern2017-01-032-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Add tests to cycle analytics See merge request !7727
| | * | | | | Make haml_lint happyadd-tests-to-cycle-analyticsAlfredo Sumaran2017-01-021-1/+1
| | | | | | |
| | * | | | | Add feature tests for Cycle AnalyticsAlfredo Sumaran2017-01-022-4/+4
| | | |/ / / | | |/| | |
| * | | | | Increases pipeline graph drowdown width in order to prevent strange position ↵Filipa Lacerda2017-01-021-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | on chrome on ubuntu Adds MR ID to changelog entry
| * | | | HAMLLint: Fix `ImplicitDiv` offence post-rebase22072-enable-haml-lintsKushal Pandya2016-12-311-1/+1
| | | | |
| * | | | HAMLLint: Fix `TrailingWhitespace` offense post-rebaseKushal Pandya2016-12-311-1/+1
| | | | |
| * | | | HAMLLint: Fix `SpaceInsideHashAttributes` offenceKushal Pandya2016-12-311-1/+1
| | | | |
| * | | | HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-31157-521/+514
| | | | |
| * | | | HAMLLint: Fix `TrailingWhitespace` offencesKushal Pandya2016-12-319-14/+12
| | | | |
| * | | | HAMLLint: Fix `SpaceBeforeScript` offencesKushal Pandya2016-12-3114-14/+14
| | | | |
| * | | | HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-3141-52/+50
| | | | |
| * | | | HAMLLint: Fix `HtmlAttributes` offencesKushal Pandya2016-12-314-8/+8
| | | | |
View Lorry Controller Status