summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix external issue tracker "Issues" link leading to 404sfix-external-issue-tracker-linkStan Hu2016-08-253-3/+4
| | | | | | | | a70431f874 modified the behavior to link to the external issue tracker issues URL instead of the project path URL. This restores the previous behavior. Closes #21252, #21402
* Merge branch 'fix-changelog' into 'master' Stan Hu2016-08-251-26/+19
|\ | | | | | | | | | | | | Fix changelog See merge request !6035
| * Fix CHANGELOG entries related to 8.11 release.Ruben Davila2016-08-251-22/+18
| |
| * Fix changelogDouwe Maan2016-08-251-4/+1
| |
* | Merge branch 'add-lock-version-to-mr-schema' into 'master' Stan Hu2016-08-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lock_version to merge_requests table Add lock_version to merge_requests table Closes #21465 It appears this column was mistakenly omitted in !5623 due to rebasing issues in earlier comments. See merge request !6037
| * | Add lock_version to merge_requests tableadd-lock-version-to-mr-schemaStan Hu2016-08-251-0/+1
| |/ | | | | | | | | | | | | Closes #21465 It appears this column was mistakenly omitted in !5623 due to rebasing issues in earlier comments.
* | Merge branch 'fix-groups-sort-dropdown-alignment' into 'master' Annabel Dunstone Gray2016-08-252-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix groups sort dropdown alignment ## What does this MR do? Changes the dropdown located on the [explore groups page](https://gitlab.com/explore/groups) from left aligned to right aligned. ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Keeps the UI consistent for dropdowns as they are right aligned on other pages ## What are the relevant issue numbers? Closes #21296 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-23_at_11.21.01_AM](/uploads/9723d0166b80dcb8d7b0228063e39a77/Screen_Shot_2016-08-23_at_11.21.01_AM.png) After: ![Screen_Shot_2016-08-23_at_11.20.52_AM](/uploads/5a55a72c10909142d02a23710736a93f/Screen_Shot_2016-08-23_at_11.20.52_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5963
| * Fix groups sort dropdown alignmentClement Ho2016-08-252-1/+2
| |
* | Merge branch 'pipeline-graph-height' into 'master' Jacob Schatz2016-08-251-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove max height on pipelines graph #### What does this MR do? Removes max-height from pipeline graph #### Why was this MR needed? The height was originally put in place because some stages have ~20 tests, which ends up looking a little lopsided and there's a large amount of white space. The scrolling container, however, is not the best solution and ends up being more difficult to scroll around to find what you're looking for. For now we can remove the height, and eventually we'll have the similar tests collapsed. #### Screenshots (if relevant) Before: ![Screen_Shot_2016-08-24_at_11.32.39_AM](/uploads/1b32403548c6f7f4189a19279f13b84b/Screen_Shot_2016-08-24_at_11.32.39_AM.png) After: ![Screen_Shot_2016-08-24_at_11.28.57_AM](/uploads/1327e37429b881265429f559d9d56482/Screen_Shot_2016-08-24_at_11.28.57_AM.png) See merge request !5988
| * | Remove max height on pipelines graphpipeline-graph-heightAnnabel Dunstone2016-08-241-1/+0
| | |
* | | Merge branch 'fix-emoji-alignment' into 'master' Jacob Schatz2016-08-252-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inline emoji text alignment ## What does this MR do? Changes the vertical alignment of inline emoji text from `middle` to `top` ## Are there points in the code the reviewer needs to double check? Potential emoji side effects (I couldn't find any) ## Why was this MR needed? Fixes UI inconsistency ## What are the relevant issue numbers? Closes #21403 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-25_at_9.57.41_AM](/uploads/b7ce1da8d0eaaea3391502238a92fc77/Screen_Shot_2016-08-25_at_9.57.41_AM.png) After: ![Screen_Shot_2016-08-25_at_9.57.49_AM](/uploads/8649c14764c3f616c487be115505c49a/Screen_Shot_2016-08-25_at_9.57.49_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6027
| * | | Fix inline emoji text alignmentClement Ho2016-08-252-1/+2
| | | |
* | | | Merge branch '21146-windows-scrollbar' into 'master' Jacob Schatz2016-08-252-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ugly horizontal scrollbars in windows ## What does this MR do? Removes horizontal scrollbars from pipelines view ## Why was this MR needed? It looked terrible. ## What are the relevant issue numbers? Closes #21146 See merge request !5942
| * | | | Fix overflow scroll21146-windows-scrollbarAnnabel Dunstone2016-08-231-1/+1
| | | | |
| * | | | Remove graph min widthAnnabel Dunstone2016-08-231-1/+0
| | | | |
| * | | | Remove ugly horizontal scrollbars in windowsAnnabel Dunstone2016-08-232-2/+2
| | | | |
* | | | | Merge branch 'fix-pipeline-horizontal-scrolling' into 'master' Jacob Schatz2016-08-251-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unnecessary horizontal scroll area in pipeline visualizations ## What does this MR do? Removes a min-width attribute for the build pipeline visualization wrapper ## Are there points in the code the reviewer needs to double check? I am curious why this line was there in the first place. Perhaps I'm just not seeing it. ## Why was this MR needed? I was noticing an unnecessary horizontal scroll bar when viewing pipeline visualizations embedded in merge request builds tab: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5627/builds ## What are the relevant issue numbers? Line appears to have been introduced in !5742 ## Screenshots (if relevant) ![Screen_Shot_2016-08-24_at_11.15.13_PM](/uploads/e395ed8d4415187735d06b8386fe4633/Screen_Shot_2016-08-24_at_11.15.13_PM.png) ## Does this MR meet the acceptance criteria? As this is a very simple cosmetic change, I don't think it warrants inclusion in the changelog, documentation, or tests. - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6005
| * | | | | Fix unnecessary horizontal scroll area in pipeline visualizationsMike Greiling2016-08-241-1/+0
| | | | | |
* | | | | | Merge branch ↵Robert Speicher2016-08-256-2/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' Handle non-UTF-8 conflicts gracefully ## What does this MR do? If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI. ## What are the relevant issue numbers? Closes #21247. See merge request !5961
| * | | | | | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-256-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These can't be resolved in the UI because if they aren't in a UTF-8 compatible encoding, they can't be rendered as JSON. Even if they could, we would be implicitly changing the file encoding anyway, which seems like a bad idea.
* | | | | | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-254-2/+34
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOG21275-getting-500-error-when-viewing-a-merge-requestSean McGivern2016-08-251-0/+4
| | | | | | | |
| * | | | | | | Don't show conflicts when there are noneSean McGivern2016-08-252-1/+11
| | | | | | | |
| * | | | | | | Handle case where conflicts aren't on disk yetSean McGivern2016-08-253-1/+19
| | | | | | | |
* | | | | | | | Merge branch '19730-mark-as-done' into 'master' Robert Speicher2016-08-253-1/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the received id is still a pending todo mark it as done ## What does this MR do? Just return properly on stale todos, for me is annoying to mark as done a todo that is already done and the done hung there forever, so I have to refresh the page. I decided to resolve the issue myself. ## What are the relevant issue numbers? Closes #19730 See merge request !5795
| * | | | | | | | Add specs to ensure a successful return 19730-mark-as-donePaco Guzman2016-08-253-1/+44
| | |_|/ / / / / | |/| | | | | | | | | | | | | | on the UI when mark as done a already done todo.
* | | | | | | | Merge branch 'statuseable-hasstatus' into 'master' Robert Speicher2016-08-255-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rename Statuseable to HasStatus ## What does this MR do? - Rename all instances of Statuseable in the codebase, to HasStatus - Rename all files from statuseable to has_status ## What are the relevant issue numbers? Closes #21103 See merge request !6003
| * | | | | | | | rename Statuseable to HasStatusDe Wet Blomerus2016-08-255-7/+7
| |/ / / / / / /
* | | | | | | | Merge branch ↵Robert Speicher2016-08-254-11/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21257-label-lists-should-shows-opened-or-closed-issues-with-that-label' into 'master' Label list shows all issues (opened or closed) with that label ## What does this MR do? Change the label list to shows all issues (opened or closed) with that label. ## What are the relevant issue numbers? Closes #21257 See merge request !5991
| * | | | | | | | Update CHANGELOG21257-label-lists-should-shows-opened-or-closed-issues-with-that-labelDouglas Barbosa Alexandre2016-08-251-2/+5
| | | | | | | | |
| * | | | | | | | Update Issue board documentationDouglas Barbosa Alexandre2016-08-251-4/+3
| | | | | | | | |
| * | | | | | | | Label list shows all issues (opened or closed) with that labelDouglas Barbosa Alexandre2016-08-252-5/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-2519-339/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
| * | | | | | | | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-2519-339/+12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-2525-124/+568
|\ \ \ \ \ \ \ \
| * | | | | | | | Change the way merge request diff compare worksdz-merge-request-versionDmitriy Zaporozhets2016-08-251-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove ref fetch (we do it during creation anyway) * remove safe_head_commit_sha for diff compare (do not depend on the source branch) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Make it more obvious when the user isn't currently viewing the latest mr versionDmitriy Zaporozhets2016-08-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-254-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add MergeRequestDiff#latest? * Remove unnecessary variable assignment Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add changelog item for merge request versions featureDmitriy Zaporozhets2016-08-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Fix db schema via db:migrate:resetDmitriy Zaporozhets2016-08-221-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Disable comments on older merge request diffDmitriy Zaporozhets2016-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Fix merge request diff cache service specDmitriy Zaporozhets2016-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Fix merge request diff apiDmitriy Zaporozhets2016-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-223-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-22211-563/+2637
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ \ \ \ \ \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-19554-1654/+32323
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Fix merge request versions api docDmitriy Zaporozhets2016-08-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Make sure merge request is fetched before collecting base sha in merge ↵Dmitriy Zaporozhets2016-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request diff Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Fix merge request diffs specDmitriy Zaporozhets2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-154-27/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>