summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use kebab case for tooltip-placementfix-timeago-tooltip-attributeClement Ho2017-08-301-1/+1
* Add testClement Ho2017-08-291-0/+10
* Fix invalid attribute used for time-ago-tooltip componentClement Ho2017-08-291-1/+1
* Merge branch '36582-fix-note-resolved-icon' into 'master'evn-fix-formatting-of-claFatih Acet2017-08-286-6/+25
|\
| * Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-iconEric Eastwood2017-08-256-6/+25
* | Merge branch 'zj-update-templates-with-warning-header' into 'master'Stan Hu2017-08-283-0/+0
|\ \
| * | Update templates to include header in the READMEZeger-Jan van de Weg2017-08-233-0/+0
* | | Update CHANGELOG.md for 9.5.2Jose Ivan Vargas2017-08-287-32/+9
* | | Merge branch 'rs-transient-mini-pipeline-graph-failure' into 'master'Douwe Maan2017-08-281-14/+4
|\ \ \
| * | | Fix a transient failure in mini_pipeline_graph_specrs-transient-mini-pipeline-graph-failureRobert Speicher2017-08-281-14/+4
* | | | Merge branch 'group-mr-search-bar' into 'master'Clement Ho2017-08-284-3/+27
|\ \ \ \
| * | | | Add changelog entryHiroyuki Sato2017-08-281-0/+5
| * | | | Add a simple spec that checks filtered search works at group merge request pageHiroyuki Sato2017-08-271-0/+15
| * | | | Add filtered search to group merge requests dashboardHiroyuki Sato2017-08-192-3/+7
* | | | | Merge branch 'sh-add-spec-to-protected-tags-deletion' into 'master'Robert Speicher2017-08-281-0/+17
|\ \ \ \ \
| * | | | | Add spec for deleting protected tagssh-add-spec-to-protected-tags-deletionStan Hu2017-08-201-0/+17
| |/ / / /
* | | | | Merge branch 'fix/import-events' into 'master'Sean McGivern2017-08-284-1/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix typoJames Lopez2017-08-281-1/+1
| * | | | fix specJames Lopez2017-08-282-1/+6
| * | | | Fix events error importing GitLab projectsJames Lopez2017-08-282-0/+9
* | | | | Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master'Robert Speicher2017-08-281-2/+1
|\ \ \ \ \
| * | | | | Improve flaky ACE editor specsh-improve-flaky-ace-editor-specStan Hu2017-08-261-2/+1
* | | | | | Merge branch 'fix-flakes' into 'master'Robert Speicher2017-08-283-3/+3
|\ \ \ \ \ \
| * | | | | | fix transient test failures caused by wrong dropdown triggerfix-flakesSimon Knox2017-08-283-3/+3
* | | | | | | Merge branch '36061-mr-ref' into 'master'Sean McGivern2017-08-282-0/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Instrument MergeRequest#ensure_ref_fetched36061-mr-refJarka Kadlecova2017-08-282-0/+8
* | | | | | | Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'Douwe Maan2017-08-282-19/+1
|\ \ \ \ \ \ \
| * | | | | | | Reenable MySQL tests on all branchesmk-reenable-mysql-tests-on-all-branchesMichael Kozono2017-08-252-19/+1
* | | | | | | | Merge branch '36792-inline-user-refresh-when-creating-project' into 'master'Douwe Maan2017-08-288-15/+107
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't treat gitlab project imports specially in Projects::CreateServiceNick Thomas2017-08-251-4/+2
| * | | | | | | | Don't add admins as masters to projects created in another user's namespaceNick Thomas2017-08-252-3/+2
| * | | | | | | | Move sidekiq-based project authorization refresh out of Projects::CreateServiceNick Thomas2017-08-257-12/+107
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'rs-aggregate-system-note-specs' into 'master'Douwe Maan2017-08-281-25/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Combine multiple expectations into one for shared system note examplers-aggregate-system-note-specsRobert Speicher2017-08-241-25/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'fix/gb/clear-schema-cache-after-running-migration-tests' into '...Sean McGivern2017-08-281-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Clear schema cache after running tests for migrationsGrzegorz Bizon2017-08-281-0/+2
* | | | | | | | | Merge branch 'rs-remove-filtered-issues-skips' into 'master'Douwe Maan2017-08-281-50/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove skipped examples in filtered issues feature specrs-remove-filtered-issues-skipsRobert Speicher2017-08-251-50/+0
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '35642-add-owner-to-triggers-factory' into 'master'Kamil TrzciƄski2017-08-284-7/+10
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 35642-add-owner-to-trigge...35642-add-owner-to-triggers-factoryLin Jen-Shin2017-08-28222-678/+1615
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Remove duplicate update for ownerLin Jen-Shin2017-08-281-1/+0
| * | | | | | | | Make default trigger factory generate an ownerLin Jen-Shin2017-08-254-6/+10
* | | | | | | | | Merge branch 'sh-simplify-system-hook-testing' into 'master'Douwe Maan2017-08-284-61/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplify system hook testing and guarantee test will firesh-simplify-system-hook-testingStan Hu2017-08-274-61/+63
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bugfix.notify-custom-participants' into 'master'Sean McGivern2017-08-284-31/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add a description to the changelogbugfix.notify-custom-participantshttp://jneen.net/2017-08-221-1/+1
| * | | | | | | | | add a changeloghttp://jneen.net/2017-08-211-0/+5
| * | | | | | | | | rm a comment that is a liehttp://jneen.net/2017-08-211-1/+0
| * | | | | | | | | don't rely on order of notification levelshttp://jneen.net/2017-08-211-27/+26
| * | | | | | | | | actually use the :participating notification typehttp://jneen.net/2017-08-211-1/+1