4add91b6e1
Use non-i18n values for setting new group-level issue/MR button text
2017-08-21 21:29:09 +00:00
142b9ec4a0
Fix two additional violations caused by previous changes
2017-08-15 15:53:16 -04:00
4edfad9678
Enable Layout/TrailingWhitespace cop and auto-correct offenses
2017-08-15 13:44:37 -04:00
c8b802471b
Enable the RSpec/HookArgument cop and auto-correct offenses
2017-08-10 19:29:42 -04:00
d1500e898b
Restore blob fixture for JavaScript tests
2017-08-08 23:25:01 +02:00
0994bbf9dd
Merge branch 'master' into ide
...
* master: (86 commits)
Show all labels
33874 confidential issue redesign
Exclude merge_jid on Import/Export attribute configuration
Resolve "User dropdown in filtered search does not load avatar on `master`"
Re-add column locked_at on migration rollback
Group-level new issue & MR using previously selected project
[EE Backport] Update log audit event in omniauth_callbacks_controller.rb
more eagerly bail when the state is prevented
Move locked_at removal to post-deployment migration
Add class to other sidebars
Improve mobile sidebar
reduce iterations by keeping a count of remaining enablers
Store & use ConvDev percentages returned by Version app
Store MergeWorker JID on merge request, and clean up stuck merges
Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
DRY up caching in AbstractReferenceFilter
Update CHANGELOG
Add CHANGELOG entry
Fix html structure Removes test for removed behavior
Port form back to use form_tag
...
2017-08-07 22:44:47 -05:00
0532bff6d4
Group-level new issue & MR using previously selected project
2017-08-07 20:55:50 +00:00
2197ee02e9
Merge branch 'master' into ide
2017-08-03 13:13:06 +02:00
72a7b30c9f
Change all `:empty_project` to `:project`
2017-08-02 17:47:31 -04:00
9513bd18c4
Ensure all project factories use `:repository` trait or `:empty_project`
2017-08-01 14:51:52 -04:00
dc04fdc1a3
Merge remote-tracking branch 'origin/master' into ide
2017-07-28 15:26:00 +01:00
6448368b5b
Merge remote-tracking branch 'origin/master' into ide
2017-07-20 17:51:07 +01:00
0b5133bac2
Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper
...
Extracted `@request.env['devise.mapping'] = Devise.mappings[:user]` and `Rails.application.env_config['devise.mapping'] = Devise.mappings[:user]`
in our tests into the helper method `set_devise_mapping`
2017-07-20 18:36:53 +02:00
9c521c8526
Made BlobViewer jasmine integration spec use snippets view instead of pblob view
2017-07-17 17:55:50 +01:00
8d49a9fd58
Add Jasmine tests for `OAuthRememberMe`
2017-07-06 06:30:07 +00:00
70b05a8377
Split up MergeRequestsController
2017-06-28 18:17:44 -05:00
8fe5602c1a
Merge branch '28717-additional-metrics-review-branch' into 'master'
...
Support additional prometheus metrics - review branch
Closes #28717
See merge request !11712
2017-06-22 16:35:05 +00:00
97c42df3b8
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
2017-06-22 15:05:52 +02:00
5145e39ef7
Fix linking to line number on parallel diff creating empty discussion
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
2017-06-21 10:16:06 -05:00
b2e1d32e7a
Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'
...
Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note
Closes #33868
See merge request !12297
2017-06-20 19:31:02 +00:00
05cfba6f6d
Uniformize code between both pipelines tables
2017-06-20 14:54:55 +00:00
f7ad9e5abb
Fix MR "Changes" diff note up arrow to edit last note
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868
While in a MR "Changes" tab looking at some diff note discussions.
Clicking reply and pressing the up-arrow should edit your last comment in
that discussion.
I suspect this regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178
where we changed the selector
2017-06-20 00:31:21 -05:00
be5f665557
Fix prometheus service frontend fixture
2017-06-16 18:26:40 +02:00
9f2c992ff1
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
2017-06-16 18:19:41 +02:00
64bb0d37d4
cleanup wip
2017-06-16 16:53:02 +02:00
b38c74d696
Revert 'New file from interface on existing branch'
2017-06-09 10:10:47 -05:00
0bcb1d35ec
Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'
...
Expand/collapse close & backlog lists in issue boards
Closes #23917
See merge request !11820
2017-06-07 15:05:37 +00:00
dbb3c28088
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
...
# Conflicts:
# app/models/project_services/prometheus_service.rb
# app/views/projects/services/_form.html.haml
2017-06-07 10:27:52 +02:00
c9a67266d2
Move issuable bulk edit form into a new sidebar.
2017-06-06 09:16:27 -04:00
51c196160a
Merge branch 'winh-styled-people-search-bar' into 'master'
...
Style people in issuable search bar
Closes #30468
See merge request !11402
2017-06-02 16:40:57 +00:00
a980a4f638
added tests for collapsing
2017-06-02 17:25:18 +01:00
dab2662194
Merge branch '31511-jira-settings' into 'master'
...
Simplify test&save actions when setting a service integration
Closes #31511
See merge request !11599
2017-06-02 14:03:15 +00:00
b22970648e
Add frontend fixture for issue list
2017-06-02 14:42:03 +02:00
f74f03383f
Merge branch 'notebook-katex-fixes' into 'master'
...
Fixes multi-line math in notebooks
Closes #30900 and #33074
See merge request !11789
2017-06-01 09:23:31 +00:00
325c55fb24
Remove extra new line
2017-06-01 07:47:16 +02:00
a678f42ebb
Tests for `integration_settings_form`
2017-06-01 07:47:16 +02:00
c3c644c722
Prometheus Service Fixture Generator
2017-05-31 17:10:30 +05:30
c65a8a6e3a
added tests
2017-05-30 16:00:57 +01:00
71777a4a18
Rename BuildsController to JobsController
...
Rename other URL generators
admin_builds_path -> admin_jobs_path
Fix tests and more renaming
Fix more tests
Also change build_id to job_id in the controller
2017-05-17 20:17:30 +08:00
b504b09b68
Added balsamiq jasmine integration test
2017-05-15 07:48:54 +00:00
a7a53cd012
Replace pipeline mock data with JSON fixture
2017-05-10 18:12:18 +02:00
ee01ebd9e4
Fixed UP arrow key not editing last comment in discussion
...
Closes #31348
2017-05-08 14:31:11 +01:00
aa440eb1c0
Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878
...
It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
2017-05-06 19:04:48 +02:00
b51f2a6080
Colorize labels in issue search field
2017-05-05 22:47:32 +00:00
79f40f27fd
Merge branch 'master' into deploy-keys-load-async
2017-05-04 15:54:16 +01:00
e69732e2fb
Pipeline table mini graph dropdown remains open when table is refreshed
2017-05-04 13:11:48 +00:00
f29e5d4d93
Merge branch 'master' into deploy-keys-load-async
2017-05-03 17:04:47 +01:00
d048d9268c
Merge branch 'metrics-deployment-history' into 'master'
...
Metrics deployment history
Closes #26914
See merge request !10649
2017-05-02 16:56:49 +00:00
54beb93ac3
Merge branch 'pdflab-in-repo' into 'master'
...
Move PDFLab assets into repo
See merge request !10642
2017-05-02 07:35:49 +00:00
96ea22208f
Started specs [ci skip]
2017-05-02 08:29:39 +01:00
Bryce Johnson
Robert Speicher
winh
Mike Greiling
Douwe Maan
Luke "Jared" Bennett
Jacopo
Timothy Andrew
Grzegorz Bizon
Pawel Chojnacki
Eric Eastwood
Jacob Schatz
Filipa Lacerda
Douwe Maan
Tim Zallmann
Phil Hughes
Sean McGivern
kushalpandya
Lin Jen-Shin
Kamil Trzcinski