summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'hide-project-name-in-project-activities' into 'master' Fatih Acet2016-07-218-20/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide project name in project activities ## What does this MR do? - hide namespace and project name on project activity page ## Are there points in the code the reviewer needs to double check? - did `.event_label` have any meaning? ## Why was this MR needed? - all events on project activity page are from the same project, so the information was redundant ## What are the relevant issue numbers? closes #18963 ## Screenshots ### Before ![events-before](/uploads/76336e3f5cb08d4ef984df73c89aa90f/events-before.png) ### After ![events-after](/uploads/4a10718ed32960efc115d7854e5cad68/events-after.png) ![after-john-activity](/uploads/d9d151a829d8d32136525e8eb7ea04ad/after-john-activity.png) See merge request !5068
| * Hide namespace and project name on project activity page (!5068)winniehell2016-07-148-20/+27
| |
* | Merge branch 'add-preview-image-border' into 'master' Fatih Acet2016-07-214-29/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add image border in Markdown preview ## What does this MR do? - add image border in Markdown preview like it is show after a comment is saved - fix margin and shade of `<hr>` in Markdown preview ## Are there points in the code the reviewer needs to double check? Is `.md` the right class to use? ## Why was this MR needed? The border was missing. ## What are the relevant issue numbers? fixes #19652 ## Screenshots ### Before ![before](/uploads/683e2af7278c33d29b2a1ae19d1136e3/before.png) ### After ![after](/uploads/07dcee531a5696303cb34b4a88357e8a/after.png) See merge request !5162
| * | Add image border in Markdown preview (!5162)winniehell2016-07-214-29/+24
| | |
* | | Merge branch 'gl-dropdown-enter-key-fix' into 'master' Fatih Acet2016-07-212-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dropdown enter key when searching ## What does this MR do? When searching in a dropdown you can now just press the enter key to trigger a click on the first row rather than having to press the down key & then enter. ## What are the relevant issue numbers? Closes #19741 See merge request !5231
| * | | Fixed issue where using arrow keys would require arrow key to be pressed twicegl-dropdown-enter-key-fixPhil Hughes2016-07-201-5/+2
| | | |
| * | | Highlights first row when filtering in dropdownsPhil Hughes2016-07-201-0/+11
| | | |
| * | | Fixed dropdown enter key when searchingPhil Hughes2016-07-202-0/+6
| | | | | | | | | | | | | | | | Closes #19741
* | | | Merge branch 'doc-award-emoji' into 'master' Rémy Coutable2016-07-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc for award emoji API ## What does this MR do? It fixes some docs for the award emoji API. ## Are there points in the code the reviewer needs to double check? @zj I'm assigning you since you wrote this docs. ## Does this MR meet the acceptance criteria? ~~- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] [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 [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 !5386
| * | | | Update doc for award emoji APIRobert Schilling2016-07-211-2/+2
| | | | |
* | | | | Merge branch '20067-wiki-not-visible-from-web' into 'master' Rémy Coutable2016-07-214-29/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Service.external_wikis return only active external wikis Fixes #20067. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since it fixes a RC12 regression - Tests - [x] Added for this feature/bug - [ ] 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 !5387
| * | | | | Make Service.external_wikis return only active external wikisRémy Coutable2016-07-214-29/+52
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch ↵Rémy Coutable2016-07-212-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '20041-gitlab-workhorse-version-should-be-update-to-0-7-8-in-our-documentation' into 'master' Update gitlab-workhorse version to 0.7.8 in installation and update guides Closes #20041. See merge request !5385
| * | | | | | Update gitlab-workhorse version to 0.7.8 in installation and update guidesRémy Coutable2016-07-212-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'artifacts-from-ref-and-build-name-api' into 'master' Rémy Coutable2016-07-219-43/+258
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API for downloading latest successful build ## What does this MR do? Implement parts of #4255, particularly the API. ## Are there points in the code the reviewer needs to double check? I still made it that `ref` could be either branch, tag, or even SHA with: ``` ruby # ref can't be HEAD, can only be branch/tag name or SHA scope :latest_successful_for, ->(ref) do table = quoted_table_name # TODO: Use `where(ref: ref).or(sha: ref)` in Rails 5 where("#{table}.ref = ? OR #{table}.sha = ?", ref, ref). success.order(id: :desc) end ``` Because the reasons I put in: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13165543 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13165921 But if you still think that it's not good to do it this way, I'll drop it and let's think about the other way to satisfy the requirement specified in https://gitlab.com/gitlab-org/gitlab-ce/issues/4255#note_13101233 It could be `status=any` or `sha=DEADBEAF` ## What are the relevant issue numbers? Part of #4255 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] 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 you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5347
| * | | | | Merge branch 'master' into artifacts-from-ref-and-build-name-apiLin Jen-Shin2016-07-21150-649/+2182
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (261 commits) Add link to user profile to commit avatar (!5163) Refactor service settings view Fix a problem with processing a pipeline where stage only has manual actions A CHANGELOG entry Don't show other actions of the same name Use limit parameter rather than hardcoded value Remove icons from explore nav Change how we style redirect_to Use flash[:notice] only Create PipelinesSettingsController for showing settings page Fix a few nitpicks Allow to disable user request access to groups/projects Enable Style/MultilineTernaryOperator rubocop cop Fix review comments Update routes Update CHANGELOG Improve implementation of variables Log cron_jobs configuration instead of raising exception Added checks for migration downtime Ensure to_json methods take optional argument ...
| * | | | | | Workaround MySQL with INNER JOIN:Lin Jen-Shin2016-07-212-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' Oh well.
| * | | | | | Just put setup directly in the test, feedback:Lin Jen-Shin2016-07-211-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13202462
| * | | | | | Cleanup the use of let, feedback:Lin Jen-Shin2016-07-211-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13202424
| * | | | | | Lose unneeded instance variables and variables, feedback:Lin Jen-Shin2016-07-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13202326
| * | | | | | It's not longer than 80 charsLin Jen-Shin2016-07-201-3/+1
| | | | | | |
| * | | | | | Make sure there's a buildLin Jen-Shin2016-07-201-0/+1
| | | | | | |
| * | | | | | Use the same logic, it should specify that it's not logged inLin Jen-Shin2016-07-201-1/+1
| | | | | | |
| * | | | | | Use 'when logging as guest' for context, feedback:Lin Jen-Shin2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13200997
| * | | | | | Cleanup that a bitLin Jen-Shin2016-07-201-42/+27
| | | | | | |
| * | | | | | Rename user2 to reporter_userLin Jen-Shin2016-07-201-5/+5
| | | | | | |
| * | | | | | Should check against `authorize_read_builds!`Lin Jen-Shin2016-07-202-0/+16
| | | | | | |
| * | | | | | Reuse those two methodsLin Jen-Shin2016-07-201-19/+10
| | | | | | |
| * | | | | | Also exclude artifacts_file with empty string, feedback:Lin Jen-Shin2016-07-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13198105
| * | | | | | Still give descriptions, feedback:Lin Jen-Shin2016-07-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13198953
| * | | | | | Use one query. Feedback:Lin Jen-Shin2016-07-201-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13199055
| * | | | | | It should be pluralLin Jen-Shin2016-07-201-1/+1
| | | | | | |
| * | | | | | Avoid mixing builds from different pipelines:Lin Jen-Shin2016-07-204-27/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we no longer join anything, just find the latest pipeline and load builds from there to avoid mixing builds. Thanks Kamil for the help and tests.
| * | | | | | Cleanup let a bit, feedback:Lin Jen-Shin2016-07-201-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13195683 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13195692 another_artifacts was no longer used and then there's no point to put let in outer scope anymore.
| * | | | | | Use only one before, feedback:Lin Jen-Shin2016-07-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13195672
| * | | | | | Past tense:Lin Jen-Shin2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13195632
| * | | | | | Past tense, feedback:Lin Jen-Shin2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13195632
| * | | | | | Join on associationLin Jen-Shin2016-07-201-1/+1
| | | | | | |
| * | | | | | More complex data manipulating tests to model, andLin Jen-Shin2016-07-202-46/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this should properly test that it's really getting the builds from the latest successful pipelines and latest successful builds.
| * | | | | | We need INNER JOIN to get the right pipeline,Lin Jen-Shin2016-07-202-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also added a test for checking this.
| * | | | | | Use shared_examples, feedback:Lin Jen-Shin2016-07-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13173599
| * | | | | | Use shared_example rather than methods, feedback:Lin Jen-Shin2016-07-201-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13173653
| * | | | | | That means different things but it's ok here.Lin Jen-Shin2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rubocop was complaining
| * | | | | | Create the pipelines/builds in mixed order, feedback:Lin Jen-Shin2016-07-201-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13176921 Also we give undesired builds another artifacts so that we could tell if returned artifacts was we actual expected.
| * | | | | | It's no longer neededLin Jen-Shin2016-07-201-2/+0
| | | | | | |
| * | | | | | Merge remote-tracking branch ↵Lin Jen-Shin2016-07-201-56/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'upstream/artifacts-from-ref-and-build-name-api-kamil' into artifacts-from-ref-and-build-name-api * upstream/artifacts-from-ref-and-build-name-api-kamil: Make minimal changes to specs
| | * | | | | | Make minimal changes to specsartifacts-from-ref-and-build-name-api-kamilKamil Trzcinski2016-07-191-56/+17
| | | | | | | |
| * | | | | | | Move Project#latest_successful_builds_for to project_spec.rbLin Jen-Shin2016-07-202-34/+43
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13173313
| * | | | | | Just use default_branch, feedback:Lin Jen-Shin2016-07-202-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13176885
| * | | | | | Now we could use normal relation, feedback:Lin Jen-Shin2016-07-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13173842