Commit Graph

1857 Commits

Author SHA1 Message Date
Filipa Lacerda ec970763e9 Adds pipeline mini-graph to system information box in Commit View 2017-03-16 00:44:31 +00:00
Kamil Trzciński b8a54fc002 Merge branch 'rs-capybara-screenshot-artifacts' into 'master'
Store capybara screenshots as build artifacts

Closes #13971

See merge request !7985
2017-03-14 15:43:53 +00:00
Christopher Bartz 7849683766 Do not show LFS object when LFS is disabled
Do not display a 404, when a user tries to retrieve the raw content of
an LFS file (pointer) if the config option "lfs_enabled" is set to
false. Instead, display the LFS pointer file directly.
2017-03-13 18:15:19 +01:00
Jacopo e0fe2834eb New file from interface on existing branch
Now you can create a new file and select a target_branch != source_branch.
If the file that you want to create already exists on the target branch an error message is shown
A glDropdown is used to select and create a new branch instead of a text field.
2017-03-13 16:36:11 +01:00
Robert Speicher 460c2d1c51 Decrease Capybara timeout for CI environment 2017-03-08 12:50:19 -05:00
Jose Ivan Vargas 3225fd3688 Removed the settings gear button inside the Project to a tab 2017-03-07 23:26:57 -06:00
Phil Hughes 12fe94c388 Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages 2017-03-07 11:40:27 +00:00
Filipa Lacerda 0ec62b6c5d Merge branch '26371-native-emojis-v3' into 'master'
Add emoji images - Base Native Unicode Emojis

Closes #26371

See merge request !9569
2017-03-07 02:34:48 +00:00
Kushal Pandya 6a2516f978 Restore keyboard shortcuts for "Activity" and "Charts" 2017-03-06 23:52:57 +00:00
Eric Eastwood e6fc0207cb Use native unicode emojis
- gl_emoji for falling back to image/css-sprite when the browser
   doesn't support an emoji
 - Markdown rendering (Banzai filter)
 - Autocomplete
 - Award emoji menu
    - Perceived perf
    - Immediate response because we now build client-side
 - Update `digests.json` generation in gemojione rake task to be more
   useful and  include `unicodeVersion`

MR: !9437

See issues

 - #26371
 - #27250
 - #22474
2017-03-06 12:54:46 -06:00
Jose Ivan Vargas 2ee8644115 Fixed tests, changed dispatcher routing to the 'repository:show'
Also modified the render calls to the deploy_keys and protected_branches
partials
2017-03-06 09:47:44 -06:00
Dmitriy Zaporozhets 2d006b4638 Merge branch 'dashboard-filter-search-keep-params' into 'master'
Fixes filtering by name reseting archive filter

Closes #28007

See merge request !9625
2017-03-04 15:18:08 +00:00
Dmitriy Zaporozhets c13c1e1b16
Improve explore projects spinach test
Project name "Internal" is too generic and can lead to false
positive/negative when there is a visibility filter on the page. So we
ensure we check for project inside list holder css class.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-04 15:30:12 +02:00
Dmitriy Zaporozhets 5bb6a85b90
Refactor projects filtering by name
Reuse same search form and behavior for dashboard#projects, group#projects
and admin#projects. Repsect all other options like sorting, personal
filter when search projects by name. Create FilterableList JS class to
handle identical behaviour of projects and groups lists.

This change also makes filtering and sorting availabe on explore#projects
and explore#groups no matter if you are logged in or not.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-03 18:39:30 +02:00
Douwe Maan 6cc4cf1e15 Fix cherry-picking or reverting through an MR 2017-03-02 17:41:05 -06:00
Kushal Pandya 52352be6be Cleaning up navigational order - Project 2017-03-02 17:57:01 +00:00
Sean McGivern 523fb730c2 Merge branch '25437-just-emoji' into 'master'
#25437 Allow posting of just an emoji in comment; add /award slash command

Closes #25437

See merge request !9382
2017-03-01 11:15:51 +00:00
mhasbini 9f949d4e24 add /award slash command
add /award slash command; Allow posting of just an emoji in comment
2017-02-28 22:38:19 +02:00
Dmitriy Zaporozhets 8a52257d2e Merge branch '27354-navigation-new-button' into 'master'
Put back the new project button

Closes #27354

See merge request !9426
2017-02-28 14:21:31 +00:00
Rémy Coutable c425f366bf Merge branch '1937-https-clone-url-username' into 'master'
Add the username of the current user to the HTTP(S) clone URL

Closes #1937

See merge request !9347
2017-02-27 12:21:04 +00:00
Jacob Schatz 52ceaa2406 Merge branch 'remove-jquery-ui-plugins' into 'master'
Removed jQuery UI highlight & autocomplete

See merge request !8420
2017-02-24 18:06:09 +00:00
Jan Christophersen 150c363752 Add the username of the current user to the HTTP(S) clone URL 2017-02-24 16:35:34 +01:00
Douwe Maan bdbc7d967a Revert "Enable Style/BarePercentLiterals"
This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
2017-02-23 09:32:42 -06:00
Douwe Maan 7d4b52b27d Enable Style/WordArray 2017-02-23 09:32:41 -06:00
Douwe Maan baafd8de26 Enable Style/BarePercentLiterals 2017-02-23 09:31:57 -06:00
Douwe Maan 030baf70d2 Enable Performance/RedundantMerge 2017-02-23 09:31:57 -06:00
Alfredo Sumaran 5600b17de7 Code style improvements 2017-02-23 03:14:16 +00:00
Annabel Dunstone Gray 8f61290f22 Put back the new project button 2017-02-22 10:15:35 -06:00
Clement Ho 649c095a67 Add filtered search to MR page 2017-02-21 12:40:57 -06:00
Douwe Maan d5e6b97451 Fix Spinach failure 2017-02-20 16:26:42 -06:00
Clement Ho 6eb45df2fd Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master'
Todo done clicking is kind of unusable.

Closes #25465

See merge request !8691
2017-02-18 09:06:22 +00:00
Jacopo 26160459b5 Todo done clicking is kind of unusable.
The Done button will change to an Undo button and the line item will be greyed out.
Bold links will be unbolded.
The user can undo the task by clicking the Undo button.
2017-02-17 22:12:19 +01:00
Kamil Trzciński 761c0c86d1 Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master'
Make pipeline retry take stages order into account

Closes #27431, #23710, and #26551

See merge request !9021
2017-02-17 15:19:41 +00:00
Rémy Coutable 15a05628b6 Merge branch 'move-spinach-dashboard-issues-test-to-rspec' into 'master'
Move dashboard issues spinach test to Rspec

See merge request !8955
2017-02-17 14:08:17 +00:00
Grzegorz Bizon 5f271a9fa2 Merge branch 'master' into fix/gb/pipeline-retry-builds-started
* master: (313 commits)
  Allow slashes in slash command arguments
  Add API endpoint to get all milestone merge requests
  remove trailing comma
  Restore pagination to admin abuse reports
  replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin
  only compress assets in production
  Reduce number of pipelines created to test pagination
  add CHANGELOG.md entry for !8761
  prevent diff unfolding link from appearing for deleted files
  fix build failures
  only show diff unfolding link if there are more lines to show
  fix typo in node section
  Only yield valid references in ReferenceFilter.references_in
  Cache js selectors; fix css
  move "Install node modules" step before "Migrate DB" within update process
  Renders pagination again for pipelines table
  update migration docs for 8.17 to include minimum node version
  Add CHANGELOG file
  Fix positioning of top scroll button
  Remove comments in migration
  ...
2017-02-17 14:31:00 +01:00
Grzegorz Bizon 953e590b18 Make build clone/retry implementation more robust 2017-02-16 13:13:10 +01:00
Annabel Dunstone Gray ee63415c74 Delete labels spinach test bc covered by rspec 2017-02-15 13:31:18 -06:00
Semyon Pupkov 6ed73dc7c2 Move dashboard issues spinach test to Rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2017-02-10 12:45:18 +05:00
Rémy Coutable 01e95b065e Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master'
Move 'User Snippets' Spinach feature to Rspec

See merge request !8574
2017-02-09 17:47:58 +00:00
Phil Hughes cd5bee0d44 Removed jQuery UI highlight & autocomplete
In an effort to tackle #18437 this removes 2 of the jQuery UI plugins. Highlight & autocomplete, both used once in our code. Highlight was just removed easily, autocomplete was replaced with GL dropdown
2017-02-09 09:16:52 +00:00
James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce'
# Conflicts:
#   db/schema.rb
2017-02-06 15:12:27 +00:00
Jacob Schatz 538a6875d3 Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master'
Remove Turbolinks

Closes #25624

See merge request !8570
2017-02-03 18:02:19 +00:00
James Edwards-Jones 1af3f3b673 Merge branch 'master' into jej-pages-picked-from-ee 2017-02-03 17:25:26 +00:00
Filipa Lacerda c5f5ce8807 Fix broken tests
Rename Build to Job

Replace "Builds" by "Jobs" and fix broken specs

Replace "Builds" by "Jobs"

Fix broken spinach test

Fix broken test

Remove `˙` at the beginning of the file

Fix broken spinach test

Fix broken tests

Changes after review
2017-02-03 09:43:04 +00:00
Bryce Johnson aa91f50836 Find .merge-request instead of sleep in MR search spec. 2017-02-02 14:53:46 -05:00
Bryce Johnson fbd09871ca Remove turbolinks. 2017-02-02 14:03:12 -05:00
Lin Jen-Shin 8fd926fe86 Project#ensure_pipeline changed the args order 2017-01-31 22:55:33 +00:00
Kamil Trzcinski 109553afd0 Fix EE specs after ci_commit rename to pipeline 2017-01-31 22:55:32 +00:00
Kamil Trzcinski 639cf728f8 Fix adding pages domain to projects in groups 2017-01-31 22:55:30 +00:00
Kamil Trzcinski c634ff42ae Fix broken feature tests 2017-01-31 22:55:28 +00:00